From 1d11c9e26a8e8cee736b7351cc1749128958a724 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Tue, 5 Jan 2021 10:16:18 -0500 Subject: [PATCH] Quote the version number in Dockerfile (#751) --- .github/workflows/docker.yaml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index e80d8ffd1..ea14c01f3 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -4,7 +4,7 @@ on: push: branches: - "master" - - "docker/**" + - "docker**" schedule: - cron: '0 0 1 * *' # first of every month @@ -26,7 +26,7 @@ jobs: # always overwrite the latest version with the CRAN version tags: "v1.0.0,latest" ref: "v1.0.0" - + # always rebuild legacy to pick up newer R library builds - name: "v0.4.6" tags: "v0.4.6" diff --git a/Dockerfile b/Dockerfile index 7f87a8bbc..8fa4f85d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG PLUMBER_REF=master RUN Rscript -e "remotes::install_github('rstudio/plumber@${PLUMBER_REF}')" EXPOSE 8000 -ENTRYPOINT ["R", "-e", "pr <- plumber::plumb(rev(commandArgs())[1]); args <- list(host = '0.0.0.0', port = 8000); if (packageVersion('plumber') >= 1.0.0) { pr$setDocs(TRUE) } else { args$swagger <- TRUE }; do.call(pr$run, args)"] +ENTRYPOINT ["R", "-e", "pr <- plumber::plumb(rev(commandArgs())[1]); args <- list(host = '0.0.0.0', port = 8000); if (packageVersion('plumber') >= '1.0.0') { pr$setDocs(TRUE) } else { args$swagger <- TRUE }; do.call(pr$run, args)"] # Copy installed example to default file at ~/plumber.R ARG ENTRYPOINT_FILE=/usr/local/lib/R/site-library/plumber/plumber/04-mean-sum/plumber.R