Merge pull request #21 from cuappdev/main

Updates

Author: MrPeterss

.env.example

@@ -1,5 +1,6 @@
 # Scraper
 CORNELL_DINING_API_URL=
+SCRAPER_CRON_SCHEDULE=0 */2 * * *
 WORKERS=
 GOOGLE_SHEETS_API_KEY=
 FREEDGE_SHEET_ID=
@@ -29,3 +30,5 @@ FIREBASE_SERVICE_ACCOUNT_PATH=./firebase-service-account.json
 PRISMA_LOG_QUERIES=true
 PRISMA_LOG_ERRORS=true
 PRISMA_LOG_WARNINGS=true
+
+CBORD_BASE_URL=

.github/workflows/deploy-prod.yml

@@ -45,7 +45,7 @@ jobs:
           script: |
             export IMAGE_TAG=${{ steps.vars.outputs.sha_short }}
             cd docker-compose
-            docker stack rm thestack
+            docker-compose down
             sleep 20s
-            docker stack deploy -c docker-compose.yml thestack
-            yes | docker system prune -a
+            docker-compose up -d
+            yes | docker system prune -a

docker-compose.yml

@@ -2,31 +2,28 @@ version: '3.8'
 
 services:
   app:
-    image: cornellappdev/eatery-blue-dev:${IMAGE_TAG}
+    image: cornellappdev/eatery-prod:${IMAGE_TAG}
     command: >
       sh -c "npx prisma db push && npm run start"
-    configs:
-      - source: firebase_service_account
-        target: /app/firebase-service-account.json
+    volumes:
+      - ./firebase-service-account.json:/app/firebase-service-account.json
     env_file: .env
     networks:
-      - eatery-network
+      eatery-network:
+        aliases:
+          - app
     ports:
-      - "8000:8000"
+      - '127.0.0.1:8000:8000'
     depends_on:
       - scraper
 
   scraper:
-    image: cornellappdev/eatery-blue-dev:${IMAGE_TAG}
+    image: cornellappdev/eatery-prod:${IMAGE_TAG}
     env_file: .env
     networks:
       - eatery-network
-    command: ["sh", "-c", "npx prisma migrate deploy && npm run scrape:scheduled"]
+    command:
+      ['sh', '-c', 'npx prisma migrate deploy && npm run scrape:scheduled']
 
 networks:
   eatery-network:
-    driver: overlay
-
-configs:
-  firebase_service_account:
-    file: ./firebase-service-account.json