Update docker-compose.yml

Author: damalis

docker-compose.yml

@@ -4,8 +4,9 @@ services:
 
     laravel:
         depends_on:
-            - database
-        image: '${PHP_IMAGE_NAME}'
+            database:
+                condition: service_healthy
+        image: ${PHP_IMAGE_NAME}
         container_name: laravel
         networks:
             - backend
@@ -28,23 +29,23 @@ services:
             - database
             - redis
         healthcheck:
-            test: ["CMD-SHELL", "curl -fk https://${DOMAIN_NAME} || exit 1"]
-            interval: 10s
+            test: ["CMD-SHELL", "/bin/pidof php-fpm > /dev/null || exit 1"]
+            interval: 5s
             timeout: 5s
-            retries: 6
-            start_period: 60s
+            retries: 50
         environment:
             TZ: '${LOCAL_TIMEZONE}'
-        labels:            
+        labels:
             - 'docker-volume-backup.stop-during-backup=true'
         command: >
-            bash -c "apt-get -y update && sh /tmp/packagecheck.sh 'zip unzip' && curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s intl pdo_mysql && if pecl install -p -- redis; then pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis; fi; curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && 
-            if [ -f \"${WEBSERVER_DOC_ROOT}/webapp/.env\" ]; then composer update --working-dir=${WEBSERVER_DOC_ROOT}/webapp; else composer create-project laravel/laravel webapp && chmod -R 777 ${WEBSERVER_DOC_ROOT}/webapp/storage/framework ${WEBSERVER_DOC_ROOT}/webapp/storage/logs; fi; 
-            sed -i \"s/DB_HOST=127.0.0.1/DB_HOST=database/;s/REDIS_HOST=127.0.0.1/REDIS_HOST=redis/\" ${WEBSERVER_DOC_ROOT}/webapp/.env; grep -qe 'date.timezone = ${LOCAL_TIMEZONE}' ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini || echo 'date.timezone = ${LOCAL_TIMEZONE}' >> ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini; php-fpm"
+            bash -c "apt-get update && sh /tmp/packagecheck.sh 'zip unzip' && curl -sSL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions -o - | sh -s intl pdo_mysql && if pecl install -p -- redis; then pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis; fi; curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer && 
+            if [ -f \"${WEBSERVER_DOC_ROOT}/.env\" ]; then composer update --working-dir=${WEBSERVER_DOC_ROOT}; else rm -f ${WEBSERVER_DOC_ROOT}/README.md && composer create-project laravel/laravel . --working-dir=${WEBSERVER_DOC_ROOT} && chmod -R 777 ${WEBSERVER_DOC_ROOT}/storage/framework ${WEBSERVER_DOC_ROOT}/storage/logs; fi; 
+            sed -i \"s/DB_HOST=127.0.0.1/DB_HOST=database/;s/REDIS_HOST=127.0.0.1/REDIS_HOST=redis/\" ${WEBSERVER_DOC_ROOT}/.env; grep -qe 'date.timezone = ${LOCAL_TIMEZONE}' ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini || echo 'date.timezone = ${LOCAL_TIMEZONE}' >> ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini; php-fpm"
 
     webserver:
         depends_on:
-            - laravel
+            laravel:
+                condition: service_healthy
         image: nginx:stable
         container_name: webserver
         networks:
@@ -78,36 +79,42 @@ services:
             NGINX_PORT: 80
             TZ: '${LOCAL_TIMEZONE}'
         command: bash -c "/docker-entrypoint.sh nginx -v; sh /tmp/ssl-conf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${NGINX_PREFIX}'"
-    
+
     certbot:
         depends_on:
             - webserver
-        image: certbot/certbot
+        image: certbot/certbot:latest
         container_name: certbot
         networks:
             - backend
         volumes:
             - 'certbot-etc:${LETSENCRYPT_CONF_PREFIX}'
             - 'certbot-var:/var/lib/letsencrypt'
-            - '/tmp/acme-challenge:/tmp/acme-challenge'                        
-        restart: unless-stopped        
+            - '/tmp/acme-challenge:/tmp/acme-challenge'
+        restart: unless-stopped
+        healthcheck:
+            test: ["CMD-SHELL", "test -d ${LETSENCRYPT_CONF_PREFIX}/live/${DOMAIN_NAME} || exit 1"]
+            interval: 5s
+            timeout: 5s
+            retries: 20
         environment:
             TZ: '${LOCAL_TIMEZONE}'
         entrypoint: /bin/sh -c "certbot certonly --webroot --webroot-path /tmp/acme-challenge --rsa-key-size 4096 --non-interactive --agree-tos --no-eff-email --force-renewal --email ${LETSENCRYPT_EMAIL} -d ${DOMAIN_NAME} -d www.${DOMAIN_NAME}; 
             trap exit TERM; while :; do certbot renew --dry-run; sleep 12h & wait $${!}; done;"
-    
+
     phpmyadmin:
         depends_on:
-            - certbot
-        image: phpmyadmin/phpmyadmin
+            certbot:
+                condition: service_healthy
+        image: phpmyadmin:latest
         container_name: phpmyadmin
         networks:
             - backend
             - frontend
         volumes:
             - type: bind
               source: ./phpmyadmin/apache2/sites-available/default-ssl.conf
-              target: '${APACHE_CONFDIR_PREFIX}/sites-available/default-ssl.conf'            
+              target: '${APACHE_CONFDIR_PREFIX}/sites-available/default-ssl.conf'
             - type: bind
               source: ./phpmyadmin/apache2/ports.conf
               target: '${APACHE_CONFDIR_PREFIX}/ports.conf'
@@ -142,9 +149,9 @@ services:
             mkdir -p ${WEBSERVER_DOC_ROOT}/../upload && chown www-data:www-data ${WEBSERVER_DOC_ROOT}/../upload && chmod a+w ${WEBSERVER_DOC_ROOT}/../upload; mkdir -p ${WEBSERVER_DOC_ROOT}/../save && chown www-data:www-data ${WEBSERVER_DOC_ROOT}/../save && chmod a+w ${WEBSERVER_DOC_ROOT}/../save; 
             grep -qxF 'ServerName 127.0.0.1' ${APACHE_CONFDIR_PREFIX}/apache2.conf || echo -e '\\nServerName 127.0.0.1' >> ${APACHE_CONFDIR_PREFIX}/apache2.conf; grep -qe 'date.timezone = ${LOCAL_TIMEZONE}' ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini || echo 'date.timezone = ${LOCAL_TIMEZONE}' >> ${PHP_INI_DIR_PREFIX}/php/conf.d/security.ini; 
             a2enmod ssl && a2ensite default-ssl && a2dissite 000-default && /docker-entrypoint.sh 'apache2-foreground'"
-    
+
     database:
-        image: '${DATABASE_IMAGE_NAME}:${DATABASE_VERSION}'
+        image: ${DATABASE_IMAGE_NAME}:${DATABASE_VERSION}
         container_name: database
         networks:
             - backend
@@ -159,6 +166,11 @@ services:
         restart: unless-stopped
         ports:
             - '3306:3306'
+        healthcheck:
+            test: ["CMD-SHELL", "${DATABASE_ADMIN_COMMANDLINE} ping --silent || exit 1"]
+            interval: 5s
+            timeout: 5s
+            retries: 50
         environment:
             MYSQL_ROOT_PASSWORD: '${MYSQL_ROOT_PASSWORD}'
             MYSQL_DATABASE: '${DB_NAME}'
@@ -167,14 +179,14 @@ services:
             MYSQL_ALLOW_EMPTY_PASSWORD: 'No'
             MYSQL_ROOT_HOST: '${MYSQL_ROOT_HOST}'
             TZ: '${LOCAL_TIMEZONE}'
-        labels:            
+        labels:
             - "docker-volume-backup.stop-during-backup=true"
             - "docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
             - "docker-volume-backup.exec-label=database"
-        command: bash -c "apt-get -y update && apt-get install -y gettext-base && export PMA_CONTROLUSER=${PMA_CONTROLUSER} export PMA_CONTROLPASS=${PMA_CONTROLPASS} && envsubst '$$PMA_CONTROLUSER,$$PMA_CONTROLPASS' < /docker-entrypoint-initdb.d/create_tables.sql.template > /docker-entrypoint-initdb.d/create_tables.sql && docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password"
-    
+        command: bash -c "${DATABASE_PACKAGE_MANAGER} && export PMA_CONTROLUSER=${PMA_CONTROLUSER} export PMA_CONTROLPASS=${PMA_CONTROLPASS} && envsubst '$$PMA_CONTROLUSER,$$PMA_CONTROLPASS' < /docker-entrypoint-initdb.d/create_tables.sql.template > /docker-entrypoint-initdb.d/create_tables.sql && docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=${DATABASE_AUTHENTICATION_PLUGIN}"
+
     redis:
-        image: 'redis:latest'
+        image: redis:latest
         container_name: redis
         networks:
             - backend
@@ -214,7 +226,7 @@ services:
             BACKUP_FILENAME: 'backup-%Y-%m-%dT%H-%M-%S.tar.gz'
             BACKUP_RETENTION_DAYS: '7'
             EXEC_LABEL: 'database'
-            #BACKUP_EXCLUDE_REGEXP: 'folder|folder|file|\\.log$$'    
+            #BACKUP_EXCLUDE_REGEXP: 'folder|folder|file|\\.log$$'
 
 networks:
     backend: null
@@ -242,6 +254,6 @@ volumes:
     dtredis:
         name: redis-data
     certbot-etc:
-        external: true        
+        external: true
     certbot-var:
         name: certbot-var