@@ -32,13 +32,16 @@ services:
3232 retries : 6
3333 start_period : 60s
3434 environment :
35+ DB_USER : ' ${DB_USER}'
36+ DB_PASSWORD : ' ${DB_PASSWORD}'
37+ DB_NAME : ' ${DB_NAME}'
3538 TZ : ' ${LOCAL_TIMEZONE}'
3639 labels :
3740 - ' docker-volume-backup.stop-during-backup=true'
3841 command : >
39- bash -c "apt-get -y update && apt-get install -y zip unzip libicu-dev && docker-php-ext-install pdo_mysql intl && 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
40- && if [ -f \"/app/basic/config/app_local.php\" ]; then composer update --prefer-dist cakephp/cakephp:~4.0 --working-dir=/app/basic --no-interaction --ignore-platform-req=ext-intl; else composer create-project --prefer-dist cakephp/app:~4.0 basic --working-dir=/app --no-interaction --ignore-platform-req=ext-intl; fi
41- && sed \"s/DB_USER/${DB_USER}/;s/DB_PASSWORD/${DB_PASSWORD}/;s/DB_NAME/${DB_NAME}/;s/__SALT__/$$ (tr -dc '[:alnum:]' </dev/urandom | head -c 32)/\" ${ WEBSERVER_DOC_ROOT}/app_local.php > /app/basic/config/app_local.php;
42+ bash -c "apt-get -y update && apt-get install -y zip unzip libicu-dev gettext-base && docker-php-ext-install pdo_mysql intl && 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 &&
43+ if [ -f \"/app/basic/config/app_local.php\" ]; then composer update --prefer-dist cakephp/cakephp:~4.0 --working-dir=/app/basic --no-interaction --ignore-platform-req=ext-intl; else composer create-project --prefer-dist cakephp/app:~4.0 basic --working-dir=/app --no-interaction --ignore-platform-req=ext-intl; fi &&
44+ export RANDOM_VALUE=$ (tr -dc '[:alnum:]' </dev/urandom | head -c 32) && envsubst '$${DB_USER},$${DB_PASSWORD},$${DB_NAME},$$RANDOM_VALUE' < ${ WEBSERVER_DOC_ROOT}/app_local.php.template > /app/basic/config/app_local.php &&
4245 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"
4346
4447webserver :
@@ -99,6 +102,7 @@ services:
99102 - backend
100103 - frontend
101104 volumes :
105+ - ' phpmyadmin:${WEBSERVER_DOC_ROOT}/sql'
102106 - type : bind
103107 source : ./phpmyadmin/apache2/sites-available/default-ssl.conf
104108 target : ' ${APACHE_CONFDIR_PREFIX}/sites-available/default-ssl.conf'
@@ -119,10 +123,10 @@ services:
119123 restart : unless-stopped
120124 ports :
121125 - ' 9090:443'
122- # links:
123- # - database
126+ links :
127+ - database
124128 environment :
125- # PMA_HOST: database
129+ PMA_HOST : ' database'
126130 PMA_PMADB : ' phpmyadmin'
127131 PMA_CONTROLUSER : ' ${PMA_CONTROLUSER}'
128132 PMA_CONTROLPASS : ' ${PMA_CONTROLPASS}'
@@ -131,7 +135,7 @@ services:
131135 MEMORY_LIMIT : ' ${PMA_MEMORY_LIMIT}'
132136 TZ : ' ${LOCAL_TIMEZONE}'
133137 command : >
134- 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
138+ 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
135139 && printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
136140 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;
137141 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;
@@ -144,9 +148,11 @@ services:
144148 - backend
145149 volumes :
146150 - ' db:/var/lib/mysql'
151+ - ' db-backup-data:/tmp/backup'
147152 - type : bind
148153 source : ./database/conf.d/z-mysql.cnf
149154 target : ' ${MYSQL_CONF_PREFIX}/z-mysql.cnf'
155+ - ' phpmyadmin:/docker-entrypoint-initdb.d'
150156 hostname : database
151157 restart : unless-stopped
152158 ports :
@@ -161,6 +167,8 @@ services:
161167 TZ : ' ${LOCAL_TIMEZONE}'
162168 labels :
163169 - " docker-volume-backup.stop-during-backup=true"
170+ - " docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
171+ - " docker-volume-backup.exec-label=database"
164172 command : " --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password"
165173
166174 redis :
@@ -185,24 +193,26 @@ services:
185193 command : " redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
186194
187195 backup :
188- image : ' futurice /docker-volume-backup'
196+ image : offen /docker-volume-backup:latest
189197 container_name : backup
190198 networks :
191199 - backend
192200 volumes :
193- - ' /var/run/docker.sock:/var/run/docker.sock:ro'
194201 - ' html:/backup/html:ro'
195202 - ' db:/backup/db:ro'
203+ - ' db-backup-data:/backup/db-backup-data:ro'
204+ - ' /var/run/docker.sock:/var/run/docker.sock:ro'
196205 - type : bind
197206 source : ./backups
198207 target : /archive
199208 hostname : backup
200209 restart : unless-stopped
201210 environment :
202- BACKUP_WAIT_SECONDS : 120
203211 BACKUP_CRON_EXPRESSION : ' 20 01 * * *'
204212 BACKUP_FILENAME : ' backup-%Y-%m-%dT%H-%M-%S.tar.gz'
205- TZ : ' ${LOCAL_TIMEZONE}'
213+ BACKUP_RETENTION_DAYS : ' 7'
214+ EXEC_LABEL : ' database'
215+ # BACKUP_EXCLUDE_REGEXP: 'folder|folder|file|\\.log$$'
206216
207217networks :
208218 backend : null
@@ -225,6 +235,15 @@ volumes:
225235 o : bind
226236 db :
227237 name : ${DATABASE_CONT_NAME}-data
238+ db-backup-data :
239+ name : ${DATABASE_CONT_NAME}-backup-data
240+ phpmyadmin :
241+ name : phpmyadmin-sql
242+ driver : local
243+ driver_opts :
244+ type : none
245+ device : ${DIRECTORY_PATH}/phpmyadmin/sql
246+ o : bind
228247 dtredis :
229248 name : redis-data
230249 certbot-etc :
0 commit comments