Add MySQL DB wait possibility

.bin/wait-for-connection

@@ -0,0 +1,47 @@
+#!/usr/local/bin/php
+<?php
+
+/**
+ * This script tries to connect to a database for a given interval
+ * Useful in case of installation e.g. to wait for the database to not generate unnecessary errors
+ *
+ * Usage: php bin/wait-for-connection {HOST} {PORT} [{TIMEOUT}]
+ */
+
+$timeout = 60;
+switch ($argc) {
+	case 4:
+		$timeout = (float)$argv[3];
+	case 3:
+		$host = $argv[1];
+		$port = (int)$argv[2];
+		break;
+	default:
+		fwrite(STDERR, 'Usage: '.$argv[0].' host port [timeout]'."\n");
+		exit(2);
+}
+if ($timeout < 0) {
+	fwrite(STDERR, 'Timeout must be greater than zero'."\n");
+	exit(2);
+}
+if ($port < 1) {
+	fwrite(STDERR, 'Port must be an integer greater than zero'."\n");
+	exit(2);
+}
+$socketTimeout = (float)ini_get('default_socket_timeout');
+if ($socketTimeout > $timeout) {
+	$socketTimeout = $timeout;
+}
+$stopTime = time() + $timeout;
+do {
+	$sock = @fsockopen($host, $port, $errno, $errstr, $socketTimeout);
+	if ($sock !== false) {
+		fclose($sock);
+		fwrite(STDOUT, "\n");
+		exit(0);
+	}
+	sleep(1);
+	fwrite(STDOUT, '.');
+} while (time() < $stopTime);
+fwrite(STDOUT, "\n");
+exit(1);

.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml

@@ -24,7 +24,8 @@ services:
       - FRIENDICA_ADMIN_MAIL=
       - FRIENDICA_TZ=
       - FRIENDICA_LANG=
-      - SITENAME=
+      - FRIENDICA_URL=
+      - FRIENDICA_SITENAME=
       - SMTP=
     env_file:
       - db.env
@@ -42,6 +43,8 @@ services:
     entrypoint: /cron.sh
     depends_on:
       - db
+    env_file:
+      - db.env
     hostname: friendica.local
 
 volumes:

.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/docker-compose.yml

@@ -24,8 +24,9 @@ services:
      - FRIENDICA_ADMIN_MAIL=
      - FRIENDICA_TZ=
      - FRIENDICA_LANG=
-     - SITENAME=
-	 - SMTP=
+     - FRIENDICA_URL=
+     - FRIENDICA_SITENAME=
+     - SMTP=
     env_file:
       - db.env
     depends_on:

.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml

@@ -24,7 +24,8 @@ services:
       - FRIENDICA_ADMIN_MAIL=
       - FRIENDICA_TZ=
       - FRIENDICA_LANG=
-      - SITENAME=
+      - FRIENDICA_URL=
+      - FRIENDICA_SITENAME=
       - SMTP=
     env_file:
       - db.env

.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/docker-compose.yml

@@ -1,78 +1,76 @@
-version: '2.1'
-services:
-
-  db:
-    image: mariadb
-    restart: always
-    volumes:
-      - db:/var/lib/mysql/
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-    env_file:
-      - db.env
-
-  app:
-    build: ./app
-    restart: always
-    volumes:
-      - friendica:/var/www/html
-    environment:
-      - AUTOINSTALL=true
-      - MAILNAME=
-      - TZ=
-      - LANGUAGE=
-    env_file:
-      - db.env
-    depends_on:
-      - db
-    hostname: friendica.local
-    labels:
-      - "traefik.backend=friendica"
-      - "traefik.frontend.entryPoints=https"
-      - "traefik.frontend.headers.SSLRedirect=true"
-      - "traefik.frontend.headers.STSSeconds=15768000"
-      - "traefik.frontend.headers.STSIncludeSubdomains=false"
-      - "traefik.frontend.headers.forceSTSHeader=true"
-      - "traefik.friendica.frontend.rule=Host:friendica.local"
-      - "traefik.friendica.frontend.port=80"
-      - "traefik.enable=true"
-      - "traefik.docker.network=proxy-tier"
-    networks:
-      - proxy-tier
-      - default
-
-  cron:
-    build: ./app
-    restart: always
-    volumes:
-      - friendica:/var/www/html
-    entrypoint: /cron.sh
-    environment:
-      - MAILNAME=
-      - TZ=
-      - LANGUAGE=
-    env_file:
-      - db.env
-    depends_on:
-      - db
-    hostname: friendica.local
-
-  proxy:
-    build: ./proxy
-    restart: always
-    ports:
-      - "80:80"
-      - "443:443"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    container_name: traefik
-    networks:
-      - default
-      - proxy-tier
-
-volumes:
-  db:
-  friendica:
-
-networks:
+version: '2.1'
+services:
+
+  db:
+    image: mariadb
+    restart: always
+    volumes:
+      - db:/var/lib/mysql/
+    environment:
+      - MYSQL_RANDOM_ROOT_PASSWORD=yes
+    env_file:
+      - db.env
+
+  app:
+    build: ./app
+    restart: always
+    volumes:
+      - friendica:/var/www/html
+    environment:
+      - FRIENDICA_ADMIN_MAIL=
+      - FRIENDICA_TZ=
+      - FRIENDICA_LANG=
+      - FRIENDICA_URL=
+      - FRIENDICA_SITENAME=
+      - SMTP=
+    env_file:
+      - db.env
+    depends_on:
+      - db
+    hostname: friendica.local
+    labels:
+      - "traefik.backend=friendica"
+      - "traefik.frontend.entryPoints=https"
+      - "traefik.frontend.headers.SSLRedirect=true"
+      - "traefik.frontend.headers.STSSeconds=15768000"
+      - "traefik.frontend.headers.STSIncludeSubdomains=false"
+      - "traefik.frontend.headers.forceSTSHeader=true"
+      - "traefik.friendica.frontend.rule=Host:friendica.local"
+      - "traefik.friendica.frontend.port=80"
+      - "traefik.enable=true"
+      - "traefik.docker.network=proxy-tier"
+    networks:
+      - proxy-tier
+      - default
+
+  cron:
+    build: ./app
+    restart: always
+    volumes:
+      - friendica:/var/www/html
+    entrypoint: /cron.sh
+    env_file:
+      - db.env
+    depends_on:
+      - db
+    hostname: friendica.local
+
+  proxy:
+    build: ./proxy
+    restart: always
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    container_name: traefik
+    networks:
+      - default
+      - proxy-tier
+
+volumes:
+  db:
+  friendica:
+
+networks:
   proxy-tier:

.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm-alpine/docker-compose.yml

@@ -20,6 +20,9 @@ services:
       - FRIENDICA_ADMIN_MAIL=
       - FRIENDICA_TZ=
       - FRIENDICA_LANG=
+      - FRIENDICA_URL=
+      - FRIENDICA_SITENAME=
+      - SMTP=
     env_file:
       - db.env
     depends_on:
@@ -32,10 +35,6 @@ services:
     volumes:
       - friendica:/var/www/html
     entrypoint: /cron.sh
-    environment:
-      - MAILNAME=
-      - TZ=
-      - LANGUAGE=
     env_file:
       - db.env
     depends_on: