Merge pull request #869 from WoLfulus/fix/docker-init

Wait for database on bootstrap

.github/actions/build-images/rootfs/directus/images/main/examples/docker-compose.yml

@@ -0,0 +1,33 @@
+version: "3"
+services:
+  database:
+    image: postgres:12
+    networks:
+      - "directus"
+    environment:
+      POSTGRES_DB: "directus"
+      POSTGRES_USER: "directus"
+      POSTGRES_PASSWORD: "directus"
+
+  directus:
+    build:
+      context: "../"
+      args:
+        VERSION: "v9.0.0-rc.5"
+        REPOSITORY: "directus/next"
+    ports:
+      - 8055:8055
+    networks:
+      - "directus"
+    environment:
+      KEY: mykey
+      SECRET: mysecret
+      DB_CLIENT: "pg"
+      DB_HOST: "database"
+      DB_PORT: "5432"
+      DB_USER: "directus"
+      DB_PASSWORD: "directus"
+      DB_DATABASE: "directus"
+
+networks:
+  directus:

.github/actions/build-images/rootfs/directus/images/main/rootfs/usr/bin/entrypoint

@@ -39,6 +39,8 @@ MSG
 function bootstrap() {
   local warn=false
 
+  print --level=info "Initializing..."
+
   if [ "${KEY}" == "" ] ; then
     export KEY=$(uuidgen)
     warn=true
@@ -75,6 +77,13 @@ WARN
     if [ ! -f "${DB_FILENAME}" ] ; then
       mkdir -p $(dirname ${DB_FILENAME})
     fi
+  else
+    print --level=info "Checking database connection"
+    timeout ${DB_TIMEOUT:-"30"} bash -c 'until nc -z -w 1 "$0" $1; do sleep 1; done' "${DB_HOST}" ${DB_PORT}
+    #while ! nc -z -w 1 "${DB_HOST}" ${DB_PORT}; do
+    #  print --level=warn "Cannot connect to the database, waiting for the server."
+    #  sleep 1
+    #done
   fi
 
   should_seed=false