chore(keycloakify): Use .nvmrc in dockerfile, bump keycloak orcid v…

…ersion
loculus-project · May 10, 2024 · 7f2789e · 7f2789e
1 parent 728e7df
commit 7f2789e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/keycloakify-build.yml b/.github/workflows/keycloakify-build.yml
@@ -57,6 +57,11 @@ jobs:
           echo "CACHE_HIT=$EXISTS" >> $GITHUB_ENV
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+      - name: Get node version build arg
+        if: env.CACHE_HIT == 'false'
+        run: |
+          NODE_VERSION=$(cat website/.nvmrc | tr -cd [:digit:].)
+          echo "NODE_VERSION=$NODE_VERSION" >> $GITHUB_ENV
       - name: Build and push image
         if: env.CACHE_HIT == 'false'
         uses: docker/build-push-action@v5
@@ -67,6 +72,7 @@ jobs:
           cache-from: type=gha,scope=keycloakify-${{ github.ref }}
           cache-to: type=gha,mode=max,scope=keycloakify-${{ github.ref }}
           platforms: ${{ env.BUILD_ARM && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
+          build-args: NODE_VERSION=${{ env.NODE_VERSION }}
       - name: Tag and push image if cache hit
         if: env.CACHE_HIT == 'true'
         run: |

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -64,6 +64,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Get node version build arg
+        if: env.CACHE_HIT == 'false'
         run: |
           NODE_VERSION=$(cat website/.nvmrc | tr -cd [:digit:].)
           echo "NODE_VERSION=$NODE_VERSION" >> $GITHUB_ENV

diff --git a/keycloak/keycloakify/.nvmrc b/keycloak/keycloakify/.nvmrc
@@ -0,0 +1 @@
+v22
diff --git a/keycloak/keycloakify/Dockerfile b/keycloak/keycloakify/Dockerfile
@@ -1,4 +1,6 @@
-FROM node:21-bookworm as builder
+ARG KEYCLOAK_ORCID_VERSION=1.3.0
+ARG NODE_VERSION=22
+FROM node:${NODE_VERSION}-bookworm as builder
 
 USER root
 RUN apt-get update && apt-get install -y maven
@@ -17,6 +19,6 @@ FROM alpine:3.19
 RUN mkdir /output
 COPY --from=builder /app/build_keycloak/target/*.jar /output/
 RUN apk add --no-cache wget curl
-RUN wget -P /output https://github.com/eosc-kc/keycloak-orcid/releases/download/1.2.0/keycloak-orcid-1.2.0.jar
+RUN wget -P /output https://github.com/eosc-kc/keycloak-orcid/releases/download/${NODE_VERSION}/keycloak-orcid-${NODE_VERSION}.jar
 RUN ls -l /output
 CMD sh -c 'cp /output/*.jar /destination/'