Merge pull request #338 from PROCOLLAB-github/dev

Deploy fixes
PROCOLLAB-github · Apr 1, 2024 · f2eee0b · f2eee0b
2 parents c1eaaf7 + 2c99c58
commit f2eee0b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/dev-ci.yml b/.github/workflows/dev-ci.yml
@@ -45,4 +45,4 @@ jobs:
               
               echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
               
-              docker-compose -f docker-compose.dev-ci.yml up -d --build --force-recreate
+              docker compose -f docker-compose.dev-ci.yml up -d --build --force-recreate
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -100,7 +100,7 @@ jobs:
               cd /home/app/procollab-backend &&
               docker container prune -f &&
               docker image prune -a -f &&
-              docker-compose -f docker-compose.prod-ci.yml -p prod pull &&
+              docker compose -f docker-compose.prod-ci.yml -p prod pull &&
               
               rm -f .env &&
               touch .env &&
@@ -127,4 +127,4 @@ jobs:
               
               echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env &&
               
-              docker-compose -f docker-compose.prod-ci.yml -p prod up -d
+              docker compose -f docker-compose.prod-ci.yml -p prod up -d
diff --git a/docker-compose.dev-ci.yml b/docker-compose.dev-ci.yml
@@ -1,15 +1,13 @@
 version: '3.9'
 
-
-
 services:
   web:
     container_name: web
     build:
       context: .
       dockerfile: ./Dockerfile
     image: ghcr.io/procollab-github/api:latest
-    restart: always
+    restart: unless-stopped
     volumes:
       - ./log:/procollab/log
     env_file:
@@ -18,9 +16,11 @@ services:
       HOST: 0.0.0.0
     expose:
       - 8000
+
   grafana:
     container_name: grafana
     image: grafana/grafana:latest
+    restart: unless-stopped
     expose:
       - 3000
     volumes:
@@ -29,28 +29,36 @@ services:
     environment:
       - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s:%(http_port)s/grafana
       - GF_SERVER_SERVE_FROM_SUB_PATH=true
+
   prometheus:
     container_name: prometheus
     image: prom/prometheus:v2.36.0
+    restart: unless-stopped
     expose:
       - 9090
     volumes:
       - prom-data:/prometheus
       - ./prometheus:/etc/prometheus
+
   nginx:
     container_name: nginx
+    restart: unless-stopped
     build: ./nginx
     depends_on:
       - web
     ports:
       - 8000:80
+
   loki:
     image: grafana/loki:2.9.0
+    restart: unless-stopped
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
+
   promtail:
     image: grafana/promtail:2.9.0
+    restart: unless-stopped
     volumes:
       - /var/log:/var/log
       - ./promtail:/etc/promtail
@@ -60,10 +68,12 @@ services:
   redis:
     container_name: redis
     image: redis:latest
+    restart: unless-stopped
     expose:
       - 6379
     volumes:
       - redis-data:/data
+
 volumes:
   grafana-data:
   grafana-configs: