Merge branch 'main' of https://github.com/UoaWDCC/auis-portal

UoaWDCC · Dec 12, 2024 · dd5d13e · dd5d13e
2 parents a9d17ab + 6390c6a
commit dd5d13e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/deploy.auisproduction.yml b/.github/workflows/deploy.auisproduction.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: flyctl deploy --remote-only --config fly.auis.toml
+      - run: flyctl deploy --remote-only --config fly.auis.toml --build-secret VITE_CLERK_PUBLISHABLE_KEY=${{ secrets.VITE_STRIPE_PUBLISHABLE_KEY }}
         working-directory: ./web
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_AUIS_API_TOKEN }}

diff --git a/strapi/Dockerfile b/strapi/Dockerfile
@@ -29,7 +29,9 @@ RUN yarn install --frozen-lockfile --production=false
 COPY --link . .
 
 # Build application
-RUN yarn run build
+RUN --mount=type=secret,id=VITE_STRIPE_PUBLISHABLE_KEY \
+  VITE_STRIPE_PUBLISHABLE_KEY="$(cat /run/secrets/VITE_STRIPE_PUBLISHABLE_KEY)"\
+  yarn run build
 
 # Remove development dependencies
 RUN yarn install --production=true
@@ -43,4 +45,4 @@ COPY --from=build /app /app
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 1337
 
-CMD [ "yarn", "run", "start" ]
+CMD [ "yarn", "run", "start" ]