Add MySQL DB wait possibility

- remove sleep - Add new binary "wait-for-connection" in /usr/local/bin - Use new possibility for auto-installer
2026-01-07 01:28:05 +01:00 · 2019-11-28 20:50:59 +01:00 · 2019-11-28 20:50:59 +01:00 · 43b1640b80
commit 43b1640b80
parent dafddd4e22
37 changed files with 691 additions and 360 deletions
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.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:
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/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
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.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
--- a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/apache/docker-compose.yml
+++ b/.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:
--- a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm-alpine/docker-compose.yml
+++ b/.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:
--- a/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-traefik-proxy/mariadb-cron-smtp/fpm/docker-compose.yml
@ -1,87 +1,85 @@
-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
-
-  cron:
-    build: ./app
-    restart: always
-    volumes:
-      - friendica:/var/www/html
-    entrypoint: /cron.sh
-    environment:
-      - MAILNAME=
-      - TZ=
-      - LANGUAGE=
-    env_file:
-      - db.env
-    depends_on:
-      - db
-      - app
-    hostname: friendica.local
-
-  web:
-    image: nginx
-    restart: always
-    volumes:
-      - friendica:/var/www/html:ro
-      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro
-    depends_on:
-      - app
-    networks:
-      - default
-      - proxy-tier
-    labels:
-      - "traefik.backend=friendica"
-      - "traefik.frontend.entryPoints=https,http"
-      - "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"
-
-  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
+
+  cron:
+    build: ./app
+    restart: always
+    volumes:
+      - friendica:/var/www/html
+    entrypoint: /cron.sh
+    env_file:
+      - db.env
+    depends_on:
+      - db
+      - app
+    hostname: friendica.local
+
+  web:
+    image: nginx
+    restart: always
+    volumes:
+      - friendica:/var/www/html:ro
+      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      - app
+    networks:
+      - default
+      - proxy-tier
+    labels:
+      - "traefik.backend=friendica"
+      - "traefik.frontend.entryPoints=https,http"
+      - "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"
+
+  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: