Fix build args

vincevd1 · May 14, 2024 · 05679ee · 05679ee
1 parent 0400b18
commit 05679ee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -87,10 +87,10 @@ jobs:
           file: ./infra/nginx/Dockerfile
           push: true
           build-args: |
-            ARG VITE_CLIENT_ID=${{ secrets.CONCREXIT_CLIENT_ID }}
-            ARG VITE_CONCREXIT_URI=https://thalia.nu
-            ARG VITE_REDIRECT_URI=https://any.thalia.nu/auth/callback
-            ARG VITE_BACKEND_URI=https://any.thalia.nu
+            VITE_CLIENT_ID=${{ secrets.CONCREXIT_CLIENT_ID }}
+            VITE_CONCREXIT_URI=https://thalia.nu
+            VITE_REDIRECT_URI=https://any.thalia.nu/auth/callback
+            VITE_BACKEND_URI=https://any.thalia.nu
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha,scope=${{ github.ref }}-thaliany-nginx

diff --git a/infra/docker-compose.yaml b/infra/docker-compose.yaml
@@ -9,6 +9,7 @@ services:
       POSTGRES_PASSWORD: thaliany
       SITE_DOMAIN: any.thalia.nu
       BASE_URL: https://any.thalia.nu
+      THALIA_BASE_URL: https://thalia.nu
       DEBUG: 0
     volumes:
       - media:/volumes/media:rw

diff --git a/server/server/settings.py b/server/server/settings.py
@@ -178,7 +178,7 @@
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 # Base url for thalia requests
-THALIA_BASE_URL = "https://staging.thalia.nu"
+THALIA_BASE_URL = os.environ.get("THALIA_BASE_URL", "https://staging.thalia.nu")
 
 # Client id
 CLIENT_ID = "7xLk3gkoqC4ANdl9r7vAR19sxgEb5EIp5pVBgYfJ"