@@ -98,6 +98,7 @@ services:
9898 - backend
9999 - frontend
100100 volumes :
101+ - ' phpmyadmin:${WEBSERVER_DOC_ROOT}/sql'
101102 - type : bind
102103 source : ./phpmyadmin/apache2/sites-available/default-ssl.conf
103104 target : ' ${APACHE_CONFDIR_PREFIX}/sites-available/default-ssl.conf'
@@ -118,10 +119,10 @@ services:
118119 restart : unless-stopped
119120 ports :
120121 - ' 9090:443'
121- # links:
122- # - database
122+ links :
123+ - database
123124 environment :
124- # PMA_HOST: database
125+ PMA_HOST : ' database'
125126 PMA_PMADB : ' phpmyadmin'
126127 PMA_CONTROLUSER : ' ${PMA_CONTROLUSER}'
127128 PMA_CONTROLPASS : ' ${PMA_CONTROLPASS}'
@@ -130,7 +131,7 @@ services:
130131 MEMORY_LIMIT : ' ${PMA_MEMORY_LIMIT}'
131132 TZ : ' ${LOCAL_TIMEZONE}'
132133 command : >
133- 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
134+ bash -c "apt-get -y update && apt-get install -y gettext-base && envsubst < ${WEBSERVER_DOC_ROOT}/sql/create_tables.sql.template > ${WEBSERVER_DOC_ROOT}/sql/create_tables.sql && echo ${PMA_HTPASSWD_USERNAME}:phpmyadmin:$$( printf \"%s:%s:%s\" \"${PMA_HTPASSWD_USERNAME}\" \"phpmyadmin\" \"${PMA_HTPASSWD_PASSWORD}\" | md5sum | awk '{print $$1}' ) > ${PMA_CONF_FOLDER}/.htpasswd
134135 && printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
135136 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;
136137 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;
@@ -143,9 +144,11 @@ services:
143144 - backend
144145 volumes :
145146 - ' db:/var/lib/mysql'
147+ - ' db-backup-data:/tmp/backup'
146148 - type : bind
147149 source : ./database/conf.d/z-mysql.cnf
148150 target : ' ${MYSQL_CONF_PREFIX}/z-mysql.cnf'
151+ - ' phpmyadmin:/docker-entrypoint-initdb.d'
149152 hostname : database
150153 restart : unless-stopped
151154 ports :
@@ -160,6 +163,8 @@ services:
160163 TZ : ' ${LOCAL_TIMEZONE}'
161164 labels :
162165 - " docker-volume-backup.stop-during-backup=true"
166+ - " docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
167+ - " docker-volume-backup.exec-label=database"
163168 command : " --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password"
164169
165170 redis :
@@ -184,24 +189,26 @@ services:
184189 command : " redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
185190
186191 backup :
187- image : ' futurice /docker-volume-backup'
192+ image : offen /docker-volume-backup:latest
188193 container_name : backup
189194 networks :
190195 - backend
191196 volumes :
192- - ' /var/run/docker.sock:/var/run/docker.sock:ro'
193197 - ' html:/backup/html:ro'
194198 - ' db:/backup/db:ro'
199+ - ' db-backup-data:/backup/db-backup-data:ro'
200+ - ' /var/run/docker.sock:/var/run/docker.sock:ro'
195201 - type : bind
196202 source : ./backups
197203 target : /archive
198204 hostname : backup
199205 restart : unless-stopped
200206 environment :
201- BACKUP_WAIT_SECONDS : 120
202207 BACKUP_CRON_EXPRESSION : ' 20 01 * * *'
203208 BACKUP_FILENAME : ' backup-%Y-%m-%dT%H-%M-%S.tar.gz'
204- TZ : ' ${LOCAL_TIMEZONE}'
209+ BACKUP_RETENTION_DAYS : ' 7'
210+ EXEC_LABEL : ' database'
211+ # BACKUP_EXCLUDE_REGEXP: 'folder|folder|file|\\.log$$'
205212
206213networks :
207214 backend : null
@@ -217,6 +224,15 @@ volumes:
217224 o : bind
218225 db :
219226 name : ${DATABASE_CONT_NAME}-data
227+ db-backup-data :
228+ name : ${DATABASE_CONT_NAME}-backup-data
229+ phpmyadmin :
230+ name : phpmyadmin-sql
231+ driver : local
232+ driver_opts :
233+ type : none
234+ device : ${DIRECTORY_PATH}/phpmyadmin/sql
235+ o : bind
220236 dtredis :
221237 name : redis-data
222238 certbot-etc :
0 commit comments