Skip to content

Commit d3e19ba

Browse files
committed
Update docker-compose.yml
1 parent 27d396b commit d3e19ba

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

docker-compose.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
labels:
3737
- 'docker-volume-backup.stop-during-backup=true'
3838
command: >
39-
bash -c "apt-get -y update && apt-get install -y zip unzip libicu-dev && docker-php-ext-install pdo_mysql intl && pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis pdo_mysql intl && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
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
4040
&& 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
4141
&& 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;
4242
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"
@@ -71,8 +71,6 @@ services:
7171
- cakephp
7272
environment:
7373
TZ: '${LOCAL_TIMEZONE}'
74-
labels:
75-
- "docker-volume-backup.stop-during-backup=true"
7674
command: bash -c "sh /tmp/ssl-conf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${HTTPD_PREFIX}/conf'"
7775

7876
certbot:
@@ -125,15 +123,13 @@ services:
125123
# - database
126124
environment:
127125
#PMA_HOST: database
128-
PMA_PMADB: phpmyadmin
126+
PMA_PMADB: 'phpmyadmin'
129127
PMA_CONTROLUSER: '${PMA_CONTROLUSER}'
130128
PMA_CONTROLPASS: '${PMA_CONTROLPASS}'
131129
MYSQL_ROOT_PASSWORD: '${MYSQL_ROOT_PASSWORD}'
132130
UPLOAD_LIMIT: '${PMA_UPLOAD_LIMIT}'
133131
MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}'
134132
TZ: '${LOCAL_TIMEZONE}'
135-
labels:
136-
- "docker-volume-backup.stop-during-backup=true"
137133
command: >
138134
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
139135
&& printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
@@ -186,8 +182,6 @@ services:
186182
environment:
187183
ALLOW_EMPTY_PASSWORD: 'yes'
188184
TZ: '${LOCAL_TIMEZONE}'
189-
labels:
190-
- "docker-volume-backup.stop-during-backup=true"
191185
command: "redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
192186

193187
backup:

0 commit comments

Comments
 (0)