From 8374a9435186992bb413ac2477b668b7c11d3001 Mon Sep 17 00:00:00 2001
From: Alexander Nickel <hello@mralexandernickel.com>
Date: Mon, 24 Apr 2023 16:13:33 +0200
Subject: [PATCH 1/2] fix: Change restart policy of worker and cron to always

Because unless-stopped won't restart the container after the process
ended, we changed the restart policies for worker and cron to "always"
instead of "unless-stopped"
---
 docker-compose-prod.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index cd81e918..ba9c66d8 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -8,6 +8,9 @@ x-volumes: &default-volume
 x-restart-policy: &restart_policy
     restart: unless-stopped
 
+x-restart-policy-always: &restart_policy_always
+    restart: always
+
 x-environment: &default-environment
     REDIS_URL: redis://redis
     DATABASE_URL: "postgresql://packeton:pack123@postgres:5432/packeton?serverVersion=14&charset=utf8"
@@ -66,7 +69,7 @@ services:
         hostname: packeton-worker
         command: ['bin/console', 'packagist:run-workers', '-v']
         user: www-data
-        <<: *restart_policy
+        <<: *restart_policy_always
         <<: *default-volume
         environment:
             <<: *default-environment
@@ -79,7 +82,7 @@ services:
         hostname: packeton-cron
         command: ['bin/console', 'okvpn:cron', '--demand', '--time-limit=3600']
         user: www-data
-        <<: *restart_policy
+        <<: *restart_policy_always
         <<: *default-volume
         environment:
             <<: *default-environment

From 58c66f12d203b438226737eea4a4c5d12b9e4bd1 Mon Sep 17 00:00:00 2001
From: Alexander Nickel <hello@mralexandernickel.com>
Date: Mon, 24 Apr 2023 16:34:39 +0200
Subject: [PATCH 2/2] fix: Use correct syntax for mapping keys

https://github.com/docker/compose/issues/10407
---
 docker-compose-prod.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index ba9c66d8..77c4e9e2 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -20,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:
@@ -39,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:
@@ -54,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:
@@ -69,8 +67,7 @@ services:
         hostname: packeton-worker
         command: ['bin/console', 'packagist:run-workers', '-v']
         user: www-data
-        <<: *restart_policy_always
-        <<: *default-volume
+        <<: [*restart_policy_always, *default-volume]
         environment:
             <<: *default-environment
             WAIT_FOR_HOST: 'php-fpm:9000'
@@ -82,8 +79,7 @@ services:
         hostname: packeton-cron
         command: ['bin/console', 'okvpn:cron', '--demand', '--time-limit=3600']
         user: www-data
-        <<: *restart_policy_always
-        <<: *default-volume
+        <<: [*restart_policy_always, *default-volume]
         environment:
             <<: *default-environment
             WAIT_FOR_HOST: 'php-fpm:9000'