Update docker-compose.yml

Author: damalis

docker-compose.yml

@@ -4,11 +4,12 @@ services:
 
     drupal:
         depends_on:
-            - database
-        image: 'drupal:${PHP_IMAGE_NAME}'
+            database:
+                condition: service_healthy
+        image: drupal:${PHP_IMAGE_NAME}
         container_name: drupal
         networks:
-            - backend            
+            - backend
         volumes:
             - 'html:${WEBSERVER_DOC_ROOT}'
             - type: bind
@@ -25,55 +26,60 @@ 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: 4
-            start_period: 40s
+            retries: 50
         environment:
             TZ: '${LOCAL_TIMEZONE}'
-        labels:            
+        labels:
             - 'docker-volume-backup.stop-during-backup=true'
         command: >
-            bash -c "if pecl install -p -- redis; then pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis; fi; composer require 'drupal/redis:^1.6'; composer require drush/drush; composer require 'drupal/purge:^3.4' && composer require 'drupal/purge_purger_http:^1.0'; 
+            bash -c "if pecl install -p -- redis; then pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis; fi; composer require drush/drush; composer require drupal/purge drupal/purge_purger_http drupal/redis; 
             if [ ! -f \"${WEBSERVER_DOC_ROOT}/sites/default/settings.php\" ]; then install -m 777 ${WEBSERVER_DOC_ROOT}/sites/default/default.settings.php ${WEBSERVER_DOC_ROOT}/sites/default/settings.php && sed -i 's/#/\\/\\/#/g' ${WEBSERVER_DOC_ROOT}/sites/default/settings.php && 
             echo -e \"\\n\\$$settings['trusted_host_patterns'] = [\\n\\t'^$$(echo \"${DOMAIN_NAME}\" | sed 's/\\./\\\\./g')$$',\\n\\t'^.+\\.$$(echo \"${DOMAIN_NAME}\" | sed 's/\\./\\\\./g')$$',\\n];\" >> ${WEBSERVER_DOC_ROOT}/sites/default/settings.php; 
             mkdir -p -m 777 ${WEBSERVER_DOC_ROOT}/sites/default/files; fi; 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; docker-php-entrypoint 'php-fpm'"
 
     webserver:
         depends_on:
-            - drupal
-        image: 'httpd:latest'
+            - varnish
+        image: httpd:latest
         container_name: webserver
         networks:
-            - backend            
+            - backend
         volumes:
             - 'html:${WEBSERVER_DOC_ROOT}'
             - type: bind
               source: ./webserver
-              target: '${HTTPD_PREFIX}/conf'            
-        hostname: webserver        
+              target: '${HTTPD_PREFIX}/conf'
+        hostname: webserver
         restart: unless-stopped
         ports:
-            - '8080:80'
+            - '80:80'
+            - '90:90'
         links:
             - drupal
         environment:
             TZ: '${LOCAL_TIMEZONE}'
         command: bash -c "sed -i 's/example.com/${DOMAIN_NAME}/g' ${HTTPD_PREFIX}/conf/extra/httpd-vhosts.conf && httpd -t; httpd-foreground"
-        
+
     certbot:
         depends_on:
             - proxy
-        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}; 
@@ -106,25 +112,28 @@ services:
         restart: unless-stopped
         ports:
             - '80:80'
-            - '443:443' 
+            - '443:443'
+        links:
+            - webserver
         environment:
             NGINX_HOST: ${DOMAIN_NAME}
             NGINX_PORT: 80
             TZ: '${LOCAL_TIMEZONE}'
         command: bash -c "/docker-entrypoint.sh nginx -v; sh /tmp/ssl-proxyconf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${PROXY_PREFIX}'"
-    
+
     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'
@@ -159,9 +168,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
@@ -171,11 +180,16 @@ services:
             - type: bind
               source: ./database/conf.d/z-mysql.cnf
               target: '${MYSQL_CONF_PREFIX}/z-mysql.cnf'
-              - 'phpmyadmin-sql:/docker-entrypoint-initdb.d'
+            - 'phpmyadmin-sql:/docker-entrypoint-initdb.d'
         hostname: database
         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}'
@@ -184,14 +198,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
@@ -210,7 +224,30 @@ services:
             ALLOW_EMPTY_PASSWORD: 'yes'
             TZ: '${LOCAL_TIMEZONE}'
         command: "redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
-    
+
+    varnish:
+        depends_on:
+            drupal:
+                condition: service_healthy
+        image: varnish:${VARNISH_VERSION}
+        container_name: varnish
+        networks:
+            - backend
+        volumes:
+            - type: bind
+              source: ./varnish/default.vcl
+              target: '${VARNISH_CONF_PREFIX}/default.vcl'
+        hostname: varnish
+        tmpfs:
+            - /var/lib/varnish:exec
+        restart: unless-stopped
+        ports:
+            - '8080:80'
+        environment:
+            VARNISH_SIZE: '${VARNISH_SIZE}'
+            TZ: '${LOCAL_TIMEZONE}'
+        command: "-a http=:8080,HTTP -p default_ttl=3600 -n /tmp/varnish_workdir"
+
     backup:
         image: offen/docker-volume-backup:latest
         container_name: backup
@@ -259,6 +296,6 @@ volumes:
     dtredis:
         name: redis-data
     certbot-etc:
-        external: true        
+        external: true
     certbot-var:
         name: certbot-var