Merge branch 'main' into fix(ci)env-var7

compsci-adl · Feb 4, 2025 · d3af1a7 · d3af1a7
2 parents 7d2c1a1 + 8781299
commit d3af1a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -49,19 +49,11 @@ jobs:
 
       - name: Build Docker container
         env:
-          NEXT_PUBLIC_KEYCLOAK_REDIRECT_URI: ${{ secrets.NEXT_PUBLIC_KEYCLOAK_REDIRECT_URI }}
-          NEXT_PUBLIC_AUTH_KEYCLOAK_ISSUER: ${{ secrets.NEXT_PUBLIC_AUTH_KEYCLOAK_ISSUER }}
-          NEXT_PUBLIC_DRIVE_LINK: ${{ secrets.NEXT_PUBLIC_DRIVE_LINK }}
-          NEXT_PUBLIC_UMAMI_WEBSITE_ID: ${{ secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
           PRODUCTION_BUILD: 'true'
         run: |
           docker buildx build \
             --cache-from=type=local,src=/tmp/.buildx-cache \
             --cache-to=type=local,dest=/tmp/.buildx-cache-new,mode=max \
-            --secret id=NEXT_PUBLIC_KEYCLOAK_REDIRECT_URI \
-            --secret id=NEXT_PUBLIC_AUTH_KEYCLOAK_ISSUER \
-            --secret id=NEXT_PUBLIC_DRIVE_LINK \
-            --secret id=NEXT_PUBLIC_UMAMI_WEBSITE_ID \
             --output type=docker,dest=csclub-website.tar \
             --platform=linux/arm64 --file=Dockerfile -t csclub-website .
           gzip csclub-website.tar

diff --git a/Dockerfile b/Dockerfile
@@ -22,15 +22,7 @@ RUN npm install -g pnpm \
 
 COPY . .
 
-RUN --mount=type=secret,id=NEXT_PUBLIC_KEYCLOAK_REDIRECT_URI,target=/run/secrets/NEXT_PUBLIC_KEYCLOAK_REDIRECT_URI \
-    --mount=type=secret,id=NEXT_PUBLIC_AUTH_KEYCLOAK_ISSUER,target=/run/secrets/NEXT_PUBLIC_AUTH_KEYCLOAK_ISSUER \
-    --mount=type=secret,id=NEXT_PUBLIC_DRIVE_LINK,target=/run/secrets/NEXT_PUBLIC_DRIVE_LINK \
-    --mount=type=secret,id=NEXT_PUBLIC_UMAMI_WEBSITE_ID,target=/run/secrets/NEXT_PUBLIC_UMAMI_WEBSITE_ID \
-    NEXT_PUBLIC_KEYCLOAK_REDIRECT_URI=$(cat /run/secrets/NEXT_PUBLIC_KEYCLOAK_REDIRECT_URI) \
-    NEXT_PUBLIC_AUTH_KEYCLOAK_ISSUER=$(cat /run/secrets/NEXT_PUBLIC_AUTH_KEYCLOAK_ISSUER) \
-    NEXT_PUBLIC_DRIVE_LINK=$(cat /run/secrets/NEXT_PUBLIC_DRIVE_LINK) \
-    NEXT_PUBLIC_UMAMI_WEBSITE_ID=$(cat /run/secrets/NEXT_PUBLIC_UMAMI_WEBSITE_ID) \
-    pnpm run build
+RUN pnpm run build
 
 # Final deployment image
 FROM node:20-bookworm-slim AS runner