Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- name: Restart docker
run: |
echo "Restarting docker"
docker compose -f docker-compose.dev.yml down
docker compose -f docker-compose.dev.yml up -d --build
docker compose -p core-life-dev -f docker-compose.dev.yml down
docker compose -p core-life-dev -f docker-compose.dev.yml up -d --build
echo "Docker restarted"

- name: Clean up
Expand Down Expand Up @@ -62,8 +62,8 @@ jobs:
- name: Restart docker
run: |
echo "Restarting docker"
docker compose -f docker-compose.prod.yml down
docker compose -f docker-compose.prod.yml up -d --build
docker compose -p core-life-prod -f docker-compose.prod.yml down
docker compose -p core-life-prod -f docker-compose.prod.yml up -d --build
echo "Docker restarted"

- name: Clean up
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_DB: ${DB_NAME}
volumes:
- pg_data:/var/lib/postgresql/data
- pg_data:/var/lib/postgresql/data_dev
networks:
- erp_network
- erp_network_dev

# --- BACKEND (GOLANG) ---
backend:
Expand All @@ -25,7 +25,7 @@ services:
env_file:
- .env
networks:
- erp_network
- erp_network_dev

# --- FRONTEND (REACT) ---
frontend:
Expand All @@ -37,11 +37,11 @@ services:
depends_on:
- backend
networks:
- erp_network
- erp_network_dev

volumes:
pg_data:
pg_data_dev:

networks:
erp_network:
erp_network_dev:
driver: bridge
12 changes: 6 additions & 6 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_DB: ${DB_NAME}
volumes:
- pg_data:/var/lib/postgresql/data
- pg_data:/var/lib/postgresql/data_prod
networks:
- erp_network
- erp_network_prod

# --- BACKEND (GOLANG) ---
backend:
Expand All @@ -27,7 +27,7 @@ services:
environment:
- AUTH_MODE=false
networks:
- erp_network
- erp_network_prod

# --- FRONTEND (REACT) ---
frontend:
Expand All @@ -39,11 +39,11 @@ services:
depends_on:
- backend
networks:
- erp_network
- erp_network_prod

volumes:
pg_data:
pg_data_prod:

networks:
erp_network:
erp_network_prod:
driver: bridge