Skip to content
Merged

Dev #633

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
2 changes: 1 addition & 1 deletion .github/workflows/dev-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
docker compose -f docker-compose.dev-ci.yml config >/dev/null
docker compose -f docker-compose.dev-ci.yml build web &&
docker compose -f docker-compose.dev-ci.yml run --rm web python manage.py migrate &&
docker compose -f docker-compose.dev-ci.yml up -d --force-recreate --remove-orphans &&
docker compose -f docker-compose.dev-ci.yml up -d --force-recreate &&

install -d /etc/nginx/procollab/includes &&
install -m 644 deploy/nginx/host/includes/proxy_app.inc /etc/nginx/procollab/includes/proxy_app.inc &&
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ jobs:

chmod 600 .env
docker compose -f docker-compose.prod-ci.yml -p prod config >/dev/null
docker compose -f docker-compose.prod-ci.yml -p prod pull
docker compose -f docker-compose.prod-ci.yml -p prod pull web celerys

docker compose -f docker-compose.prod-ci.yml -p prod run --rm web python manage.py migrate
docker compose -f docker-compose.prod-ci.yml -p prod up -d --remove-orphans
docker compose -f docker-compose.prod-ci.yml -p prod up -d
if [ "$(id -u)" -eq 0 ]; then
nginx -t
systemctl reload nginx
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- "127.0.0.1:8000:8000"

redis:
image: redis:latest
image: redis:8.6.2
restart: unless-stopped
expose:
- 6379
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.prod-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
ports:
- "127.0.0.1:8000:8000"
redis:
image: redis:latest
image: redis:8.6.2
restart: unless-stopped
expose:
- 6379
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
redis:
profiles: ["legacy"]
container_name: redis
image: redis:latest
image: redis:8.6.2
expose:
- 6379
volumes:
Expand Down
Loading