update build actions

iandday · Apr 27, 2024 · aed5c03 · aed5c03
1 parent 625cc52
commit aed5c03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.env.example b/.env.example
@@ -10,5 +10,3 @@ ENABLE_REGISTRATION=
 MEDIA_PATH=
 ADMIN_PASSWORD=
 ADMIN_EMAIL=
-ADMIN_FIRST_NAME=
-ADMIN_LAST_NAME=
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -73,6 +73,10 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./
+          build-args: |
+            "VITE_BACKEND_URL=https://plant.ianday.me"
+            "VITE_PAGE_TITLE=Plant Tracker"
+            "BASE=/static"
           file: ./Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,7 +29,6 @@ services:
       - ./media:/media
       - ./static:/static
     environment:
-      - DATABASE_URL=psql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
       - SECRET_KEY=${SECRET_KEY}
       - JWT_SIGNING_KEY=${JWT_SIGNING_KEY}
       - JWT_ACCESS_TOKEN_LIFETIME_MINUTES=${JWT_ACCESS_TOKEN_LIFETIME_MINUTES}
@@ -44,6 +43,7 @@ services:
       - POSTGRES_DB=${POSTGRES_DB}
       - POSTGRES_HOST=db
       - POSTGRES_PORT=5432
+      - DATABASE_URL=psql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
   db:
     image: postgres:14.5
     ports: