Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Change restart policy of worker and cron to always #107

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: Change restart policy of worker and cron to always #107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8374a94
fix: Change restart policy of worker and cron to always
mralexandernickel Apr 24, 2023
58c66f1
fix: Use correct syntax for mapping keys
mralexandernickel Apr 24, 2023
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
21 changes: 10 additions & 11 deletions docker-compose-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ x-volumes: &default-volume
x-restart-policy: &restart_policy
restart: unless-stopped

x-restart-policy-always: &restart_policy_always
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All containers must have the same restart policy. For example, after Docker daemon restarts, database is not started automatically, but worker is require a database

restart: always

x-environment: &default-environment
REDIS_URL: redis://redis
DATABASE_URL: "postgresql://packeton:pack123@postgres:5432/packeton?serverVersion=14&charset=utf8"
Expand All @@ -17,14 +20,14 @@ services:
redis:
image: redis:7-alpine
hostname: redis
<<: *restart_policy
<<: [*restart_policy]
volumes:
- redis-data:/data

postgres:
image: postgres:14-alpine
hostname: postgres
<<: *restart_policy
<<: [*restart_policy]
volumes:
- postgres-data:/var/lib/postgresql/data
environment:
Expand All @@ -36,10 +39,9 @@ services:
image: packeton/packeton:latest
hostname: php-fpm
command: ['php-fpm', '-F']
<<: *restart_policy
<<: *default-volume
<<: [*restart_policy, *default-volume]
environment:
<<: *default-environment
<<: [*default-environment]
SKIP_INIT: 0
WAIT_FOR_HOST: 'postgres:5432'
depends_on:
Expand All @@ -51,8 +53,7 @@ services:
hostname: nginx
ports:
- '127.0.0.1:8088:80'
<<: *restart_policy
<<: *default-volume
<<: [*restart_policy, *default-volume]
command: >
bash -c 'sed s/_PHP_FPM_HOST_/php-fpm:9000/g < docker/nginx/nginx-tpl.conf > /etc/nginx/nginx.conf && nginx'
environment:
Expand All @@ -66,8 +67,7 @@ services:
hostname: packeton-worker
command: ['bin/console', 'packagist:run-workers', '-v']
user: www-data
<<: *restart_policy
<<: *default-volume
<<: [*restart_policy_always, *default-volume]
environment:
<<: *default-environment
WAIT_FOR_HOST: 'php-fpm:9000'
Expand All @@ -79,8 +79,7 @@ services:
hostname: packeton-cron
command: ['bin/console', 'okvpn:cron', '--demand', '--time-limit=3600']
user: www-data
<<: *restart_policy
<<: *default-volume
<<: [*restart_policy_always, *default-volume]
environment:
<<: *default-environment
WAIT_FOR_HOST: 'php-fpm:9000'
Expand Down