Update docker-compose.yml

Author: damalis

docker-compose.yml

@@ -36,7 +36,7 @@ services:
         labels:            
             - 'docker-volume-backup.stop-during-backup=true'
         command: >
-            bash -c "pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis && 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 'drupal/redis:^1.6'; composer require drush/drush; composer require 'drupal/purge:^3.4' && composer require 'drupal/purge_purger_http:^1.0'; 
             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'"
@@ -70,15 +70,13 @@ services:
         ports:
             - '80:80'
             - '443:443'
-            - '81:81'
+            - '90:90'
         links:
             - drupal
         environment:
             NGINX_HOST: ${DOMAIN_NAME}
             NGINX_PORT: 80
-            TZ: '${LOCAL_TIMEZONE}'            
-        labels:            
-            - "docker-volume-backup.stop-during-backup=true"
+            TZ: '${LOCAL_TIMEZONE}'
         command: bash -c "/docker-entrypoint.sh nginx -v; sh /tmp/ssl-conf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${NGINX_PREFIX}'"
 
     certbot:
@@ -138,8 +136,6 @@ services:
             UPLOAD_LIMIT: '${PMA_UPLOAD_LIMIT}'
             MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}'
             TZ: '${LOCAL_TIMEZONE}'
-        labels:            
-            - "docker-volume-backup.stop-during-backup=true"
         command: >
             bash -c "echo ${PMA_HTPASSWD_USERNAME}:phpmyadmin:$$( printf \"%s:%s:%s\" \"${PMA_HTPASSWD_USERNAME}\" \"phpmyadmin\" \"${PMA_HTPASSWD_PASSWORD}\" | md5sum | awk '{print $$1}' ) > ${PMA_CONF_FOLDER}/.htpasswd 
             && printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest; 
@@ -154,6 +150,7 @@ services:
             - backend
         volumes:
             - 'db:/var/lib/mysql'
+            - 'db-backup-data:/tmp/backup'
             - type: bind
               source: ./database/conf.d/z-mysql.cnf
               target: '${MYSQL_CONF_PREFIX}/z-mysql.cnf'
@@ -171,6 +168,8 @@ services:
             TZ: '${LOCAL_TIMEZONE}'
         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: "--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password"
 
     redis:
@@ -192,8 +191,6 @@ services:
         environment:
             ALLOW_EMPTY_PASSWORD: 'yes'
             TZ: '${LOCAL_TIMEZONE}'
-        labels:            
-            - "docker-volume-backup.stop-during-backup=true"
         command: "redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
 
     varnish:
@@ -214,29 +211,29 @@ services:
         environment:
             VARNISH_SIZE: '${VARNISH_SIZE}'
             TZ: '${LOCAL_TIMEZONE}'
-        labels:            
-            - "docker-volume-backup.stop-during-backup=true"
         command: "-a http=:8080,HTTP -p default_ttl=3600"
 
     backup:
-        image: 'futurice/docker-volume-backup'
+        image: offen/docker-volume-backup:latest
         container_name: backup
         networks:
             - backend
         volumes:
-            - '/var/run/docker.sock:/var/run/docker.sock:ro'
             - 'html:/backup/html:ro'
             - 'db:/backup/db:ro'
+            - 'db-backup-data:/backup/db-backup-data:ro'
+            - '/var/run/docker.sock:/var/run/docker.sock:ro'
             - type: bind
               source: ./backups
               target: /archive
         hostname: backup
         restart: unless-stopped
         environment:
-            BACKUP_WAIT_SECONDS: 120
             BACKUP_CRON_EXPRESSION: '20 01 * * *'
             BACKUP_FILENAME: 'backup-%Y-%m-%dT%H-%M-%S.tar.gz'
-            TZ: '${LOCAL_TIMEZONE}'    
+            BACKUP_RETENTION_DAYS: '7'
+            EXEC_LABEL: 'database'
+            #BACKUP_EXCLUDE_REGEXP: 'folder|folder|file|\\.log$$'    
 
 networks:
     backend: null
@@ -252,6 +249,8 @@ volumes:
             o: bind
     db:
         name: ${DATABASE_CONT_NAME}-data
+    db-backup-data:
+        name: ${DATABASE_CONT_NAME}-backup-data
     dtredis:
         name: redis-data
     certbot-etc: