add ARG to dockefile and go back to build-args

toiki-org · Feb 17, 2025 · 00910a0 · 00910a0
1 parent c490c06
commit 00910a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build_deploy.yaml b/.github/workflows/build_deploy.yaml
@@ -23,19 +23,19 @@ jobs:
           filters: |
             bot:
               - 'bot/**'
-              - '.github/**'
+              - '.github/workflows/**'
             server:
               - 'server/**'
-              - '.github/**'
+              - '.github/workflows/**'
             client:
               - 'client/**'
-              - '.github/**'
+              - '.github/workflows/**'
             nginx:
               - 'nginx/**'
-              - '.github/**'
+              - '.github/workflows/**'
             certbot:
               - 'certbot/**'
-              - '.github/**'
+              - '.github/workflows/**'
 
       - name: Login to DockerHub
         uses: docker/login-action@v1 
@@ -54,8 +54,8 @@ jobs:
           no-cache: true
           # cache-from: type=registry,ref=ghcr.io/toiki-org/toiki-build:latest
           # cache-to: type=inline
-          secrets: |
-            "VITE_API_URL='https://api.toiki.elbarae.me'"
+          build-args: |
+            VITE_API_URL=${{ secrets.API_URL }}
 
       - name: Build & Publish toiki-nginx
         if: steps.filter.outputs.client == 'true' || steps.filter.outputs.nginx == 'true'

diff --git a/client/Dockerfile b/client/Dockerfile
@@ -1,5 +1,7 @@
 
 FROM node:18-alpine as build
+ARG VITE_API_URL
+ENV VITE_API_URL=${VITE_API_URL}
 WORKDIR /app
 COPY package.json ./
 COPY yarn.lock ./