Add init scripts to Docker image

Author: codedmonkey

Dockerfile

@@ -76,6 +76,7 @@ COPY docker/php.ini /etc/php82/conf.d/
 COPY docker/php-fpm.conf /etc/php82/
 COPY docker/supervisord.conf /etc/
 COPY docker/process /srv/process/
+COPY docker/scripts /srv/scripts/
 
 USER dirigent
 

docker/init.sh

@@ -2,4 +2,13 @@
 
 set -e
 
+# Run init scripts
+for file in $(find "/srv/scripts/init" -type f | sort -t '-' -k1,1n)
+do
+    echo "Execute init script: $file"
+
+    sh "$file"
+done
+
+# Start Supervisor
 exec supervisord

docker/process/consumer.sh

@@ -2,9 +2,16 @@
 
 set -e
 
-while [ -z "$(netstat -an | grep :9000)" ]; do
-  echo "Waiting for app";
-  sleep 5;
-done;
+while [ ! "$(netstat -an | grep :9000)" ]; do
+  echo "Worker is waiting for application"
 
-exec /srv/app/bin/console messenger:consume async scheduler_packages --sleep 10
+  sleep 5
+done
+
+function shutdown() {
+    bin/console messenger:stop-workers
+}
+
+trap shutdown HUP INT QUIT ABRT KILL ALRM TERM TSTP
+
+exec bin/console messenger:consume async scheduler_packages --sleep 10

docker/process/fpm.sh

@@ -2,15 +2,10 @@
 
 set -e
 
-composer run-script --no-ansi --no-interaction auto-scripts
+while [ ! $(pg_isready) ]; do
+  echo "Application is waiting for the database"
 
-# todo temporary timeout for database connection
-while ! nc -z localhost 5432; do
-  echo "Waiting for database connection";
-  sleep 3;
-done;
-
-bin/console doctrine:database:create --if-not-exists --no-ansi --no-interaction
-bin/console doctrine:migrations:migrate --allow-no-migration --no-ansi --no-interaction
+  sleep 3
+done
 
 exec php-fpm

docker/process/postgresql.sh

@@ -2,16 +2,10 @@
 
 set -e
 
-function shutdown()
-{
+function shutdown() {
     pkill postgres
 }
 
-if [ ! -d "/srv/data/postgresql" ]; then
-  mkdir -p /srv/data/postgresql
-  initdb /srv/data/postgresql
-fi
-
 trap shutdown HUP INT QUIT ABRT KILL ALRM TERM TSTP
 
 exec postgres -D /srv/data/postgresql

docker/scripts/init/10-postgres-init.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+if [ -d "/srv/data/postgresql" ]; then
+  echo "Database directory found"
+
+  # Start Postgres server
+  pg_ctl start -D /srv/data/postgresql
+
+  exit 0
+fi
+
+echo "Creating PostgreSQL database..."
+
+# Create database directory
+mkdir -p /srv/data/postgresql
+
+# Initialize database storage
+initdb /srv/data/postgresql
+
+# Start Postgres server
+pg_ctl start -D /srv/data/postgresql
+
+# Create database
+createdb dirigent
+
+echo "Created PostgreSQL database"

docker/scripts/init/30-composer-scripts.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+composer run-script --no-ansi --no-interaction auto-scripts

docker/scripts/init/70-database-migrations.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+bin/console doctrine:migrations:sync-metadata-storage --no-ansi --no-interaction
+bin/console doctrine:migrations:migrate --allow-no-migration --no-ansi --no-interaction

docker/scripts/init/90-postgres-close.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# Stop Postgres server
+pg_ctl stop -D /srv/data/postgresql

tests/Docker/Standalone/DockerStandaloneTestCase.php

@@ -15,7 +15,7 @@ protected function setUp(): void
     {
         $this->container = (new GenericContainer('dirigent-standalone'))
             ->withExposedPorts(7015)
-            ->withMount(__DIR__ . '/scripts', '/srv/tests')
+            ->withMount(__DIR__ . '/scripts', '/srv/scripts/tests')
             ->withWait(new WaitForLog('ready to handle connections'))
             ->start();
     }
@@ -27,7 +27,7 @@ protected function tearDown(): void
 
     protected function assertCommandSuccessful(array $command, ?string $message = null): void
     {
-        $result = $this->container->exec(['sh', '/srv/tests/command-successful.sh', ...$command]);
+        $result = $this->container->exec(['sh', '/srv/scripts/tests/command-successful.sh', ...$command]);
         if ('0' === $result) {
             $this->addToAssertionCount(1);
         } else {