Skip to content

Commit 3951c30

Browse files
authored
Merge pull request #632 from PROCOLLAB-github/prod-release-hardening
Зафиксирована Redis 8.6.2 и смягчён автодеплой
2 parents d3aa132 + 815df1b commit 3951c30

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/dev-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
docker compose -f docker-compose.dev-ci.yml config >/dev/null
5353
docker compose -f docker-compose.dev-ci.yml build web &&
5454
docker compose -f docker-compose.dev-ci.yml run --rm web python manage.py migrate &&
55-
docker compose -f docker-compose.dev-ci.yml up -d --force-recreate --remove-orphans &&
55+
docker compose -f docker-compose.dev-ci.yml up -d --force-recreate &&
5656
5757
install -d /etc/nginx/procollab/includes &&
5858
install -m 644 deploy/nginx/host/includes/proxy_app.inc /etc/nginx/procollab/includes/proxy_app.inc &&

.github/workflows/release-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ jobs:
181181
182182
chmod 600 .env
183183
docker compose -f docker-compose.prod-ci.yml -p prod config >/dev/null
184-
docker compose -f docker-compose.prod-ci.yml -p prod pull
184+
docker compose -f docker-compose.prod-ci.yml -p prod pull web celerys
185185
186186
docker compose -f docker-compose.prod-ci.yml -p prod run --rm web python manage.py migrate
187-
docker compose -f docker-compose.prod-ci.yml -p prod up -d --remove-orphans
187+
docker compose -f docker-compose.prod-ci.yml -p prod up -d
188188
if [ "$(id -u)" -eq 0 ]; then
189189
nginx -t
190190
systemctl reload nginx

docker-compose.dev-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
- "127.0.0.1:8000:8000"
1818

1919
redis:
20-
image: redis:latest
20+
image: redis:8.6.2
2121
restart: unless-stopped
2222
expose:
2323
- 6379

docker-compose.prod-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
ports:
1414
- "127.0.0.1:8000:8000"
1515
redis:
16-
image: redis:latest
16+
image: redis:8.6.2
1717
restart: unless-stopped
1818
expose:
1919
- 6379

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ services:
3333
redis:
3434
profiles: ["legacy"]
3535
container_name: redis
36-
image: redis:latest
36+
image: redis:8.6.2
3737
expose:
3838
- 6379
3939
volumes:

0 commit comments

Comments
 (0)