Fix docker file; bump up GHA refs

OHDSI · Feb 21, 2024 · 1f22f00 · 1f22f00
1 parent 12c29b7
commit 1f22f00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/release_docker.yaml b/.github/workflows/release_docker.yaml
@@ -29,9 +29,9 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GH_TOKEN }}
-      DOCKER_IMAGE: ${{ inputs.docker_image.default || secrets.DOCKER_IMAGE }}
+      DOCKER_IMAGE: ${{ inputs.docker_image || secrets.DOCKER_IMAGE }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # ------------------------------------
       # The pattern for the following steps is specified
@@ -40,7 +40,7 @@ jobs:
       # Add Docker labels and tags
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.DOCKER_IMAGE }}
           tag-match: v(.*)
@@ -61,7 +61,7 @@ jobs:
           echo "::set-output name=sha8::${GITHUB_SHA::8}"
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: ./
           file: ./Dockerfile

diff --git a/Dockerfile b/Dockerfile
@@ -35,6 +35,6 @@ RUN --mount=type=secret,id=build_github_pat \
     cp /usr/local/lib/R/etc/Renviron /tmp/Renviron \
     && echo "GITHUB_PAT=$(cat /run/secrets/build_github_pat)" >> /usr/local/lib/R/etc/Renviron \
     && echo "INSTATIATED_MODULES_FOLDER=/home/ohdsi/strategus/modules" >> /usr/local/lib/R/etc/Renviron \
-    && Rscript -e "\
+    && R -e "\
        analysisSpecifications <- ParallelLogger::loadSettingsFromJson(fileName = system.file('testdata/analysisSpecification.json', package = 'Strategus')); \
        Strategus::ensureAllModulesInstantiated(analysisSpecifications)"