Merge pull request #268 from UoaWDCC/chore/I-want-to-kill-myself

Chore/i want to kill myself
UoaWDCC · Oct 20, 2024 · 3f60996 · 3f60996
2 parents df2c395 + fd285a4
commit 3f60996
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 5 deletions.
diff --git a/.github/workflows/deploy.production.yml b/.github/workflows/deploy.production.yml
@@ -0,0 +1,26 @@
+name: Fly Deploy Production
+
+on: [workflow_dispatch]
+
+jobs:
+  deploy-web:
+    name: Deploy Web
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only --config fly.production.toml --build-arg VITE_FIREBASE_PROJECT_ID=${{ secrets.VITE_FIREBASE_PROJECT_ID }} --build-arg VITE_REACT_APP_API_KEY=${{ secrets.VITE_REACT_APP_API_KEY }} --build-arg VITE_REACT_APP_AUTH_DOMAIN=${{ secrets.VITE_REACT_APP_AUTH_DOMAIN }} --build-arg VITE_REACT_APP_STORAGE_BUCKET=${{ secrets.VITE_REACT_APP_STORAGE_BUCKET }} --build-arg VITE_REACT_APP_MESSAGING_SENDER_ID=${{ secrets.VITE_REACT_APP_MESSAGING_SENDER_ID }} --build-arg VITE_REACT_APP_APP_ID=${{ secrets.VITE_REACT_APP_APP_ID }} --build-arg VITE_REACT_APP_MEASUREMENT_ID=${{ secrets.VITE_REACT_APP_MEASUREMENT_ID }} --build-arg VITE_REACT_APP_SERVER_URL=${{ secrets.VITE_REACT_APP_SERVER_URL_PRODUCTION }}
+        working-directory: ./frontend
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_PRODUCTION_API_TOKEN }}
+
+  deploy-api:
+    name: Deploy Api
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only --config fly.production.toml
+        working-directory: ./backend
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_PRODUCTION_API_TOKEN }}
diff --git a/.github/workflows/deploy.staging.yml b/.github/workflows/deploy.staging.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.staging.toml --build-arg VITE_FIREBASE_PROJECT_ID=${{ secrets.VITE_FIREBASE_PROJECT_ID }} --build-arg VITE_REACT_APP_API_KEY=${{ secrets.VITE_REACT_APP_API_KEY }} --build-arg VITE_REACT_APP_AUTH_DOMAIN=${{ secrets.VITE_REACT_APP_AUTH_DOMAIN }} --build-arg VITE_REACT_APP_STORAGE_BUCKET=${{ secrets.VITE_REACT_APP_STORAGE_BUCKET }} --build-arg VITE_REACT_APP_MESSAGING_SENDER_ID=${{ secrets.VITE_REACT_APP_MESSAGING_SENDER_ID }} --build-arg VITE_REACT_APP_APP_ID=${{ secrets.VITE_REACT_APP_APP_ID }} --build-arg VITE_REACT_APP_MEASUREMENT_ID=${{ secrets.VITE_REACT_APP_MEASUREMENT_ID }}
+      - run: flyctl deploy --remote-only --config fly.staging.toml --build-arg VITE_FIREBASE_PROJECT_ID=${{ secrets.VITE_FIREBASE_PROJECT_ID }} --build-arg VITE_REACT_APP_API_KEY=${{ secrets.VITE_REACT_APP_API_KEY }} --build-arg VITE_REACT_APP_AUTH_DOMAIN=${{ secrets.VITE_REACT_APP_AUTH_DOMAIN }} --build-arg VITE_REACT_APP_STORAGE_BUCKET=${{ secrets.VITE_REACT_APP_STORAGE_BUCKET }} --build-arg VITE_REACT_APP_MESSAGING_SENDER_ID=${{ secrets.VITE_REACT_APP_MESSAGING_SENDER_ID }} --build-arg VITE_REACT_APP_APP_ID=${{ secrets.VITE_REACT_APP_APP_ID }} --build-arg VITE_REACT_APP_MEASUREMENT_ID=${{ secrets.VITE_REACT_APP_MEASUREMENT_ID }} --build-arg VITE_REACT_APP_SERVER_URL=${{ secrets.VITE_REACT_APP_SERVER_URL_STAGING }}
         working-directory: ./frontend
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_STAGING_API_TOKEN }}

diff --git a/backend/fly.production.toml b/backend/fly.production.toml
@@ -0,0 +1,18 @@
+app = 'wdcc-vps-api'
+primary_region = 'syd'
+
+[build]
+  dockerfile = "Dockerfile"
+
+[http_service]
+  internal_port = 5000
+  force_https = true
+  auto_stop_machines = true
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ['app']
+
+[[vm]]
+  cpu_kind = 'shared'
+  cpus = 1
+  memory_mb = 1024
diff --git a/frontend/Dockerfile.staging → frontend/Dockerfile b/frontend/Dockerfile.staging → frontend/Dockerfile
@@ -34,6 +34,7 @@ ARG VITE_REACT_APP_STORAGE_BUCKET
 ARG VITE_REACT_APP_MESSAGING_SENDER_ID
 ARG VITE_REACT_APP_APP_ID
 ARG VITE_REACT_APP_MEASUREMENT_ID
+ARG VITE_REACT_APP_SERVER_URL
 
 ENV VITE_FIREBASE_PROJECT_ID=${VITE_FIREBASE_PROJECT_ID}
 ENV VITE_REACT_APP_API_KEY=${VITE_REACT_APP_API_KEY}
@@ -42,9 +43,7 @@ ENV VITE_REACT_APP_STORAGE_BUCKET=${VITE_REACT_APP_STORAGE_BUCKET}
 ENV VITE_REACT_APP_MESSAGING_SENDER_ID=${VITE_REACT_APP_MESSAGING_SENDER_ID}
 ENV VITE_REACT_APP_APP_ID=${VITE_REACT_APP_APP_ID}
 ENV VITE_REACT_APP_MEASUREMENT_ID=${VITE_REACT_APP_MEASUREMENT_ID}
-
-# Set server URL
-ENV VITE_REACT_APP_SERVER_URL="https://wdcc-vps-api-staging.fly.dev"
+ENV VITE_REACT_APP_SERVER_URL=${VITE_REACT_APP_SERVER_URL}
 
 # Build the app with environment variables
 RUN yarn run build

diff --git a/frontend/fly.production.toml b/frontend/fly.production.toml
@@ -0,0 +1,19 @@
+app = 'wdcc-vps'
+primary_region = 'syd'
+
+[build]
+  # dockerfile contains build time non-sensitive env vars
+  dockerfile = "Dockerfile"
+
+[http_service]
+  internal_port = 80
+  force_https = true
+  auto_stop_machines = true
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ['app']
+
+[[vm]]
+  cpu_kind = 'shared'
+  cpus = 1
+  memory_mb = 1024
diff --git a/frontend/fly.staging.toml b/frontend/fly.staging.toml
@@ -3,7 +3,7 @@ primary_region = 'syd'
 
 [build]
   # dockerfile contains build time non-sensitive env vars
-  dockerfile = "Dockerfile.staging"
+  dockerfile = "Dockerfile"
 
 [http_service]
   internal_port = 80