Skip to content

Commit e0b7221

Browse files
committed
Update docker-compose.yml
1 parent 6277bef commit e0b7221

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 intl && pecl install -o -f redis && rm -rf /tmp/pear && docker-php-ext-enable redis 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 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 \"${WEBSERVER_DOC_ROOT}/web.php\" ]; then composer update --prefer-dist yiisoft/yii2-app-basic --working-dir=/app/basic; else composer create-project --prefer-dist yiisoft/yii2-app-basic basic; fi &&
4141
composer require --prefer-dist "yiisoft/yii2-redis":~2.0.0 --working-dir=/app/basic; cp -R /app/basic/web/css ${WEBSERVER_DOC_ROOT}/; sed \"s/DB_USER/${DB_USER}/;s/DB_PASSWORD/${DB_PASSWORD}/;s/DB_NAME/${DB_NAME}/\" ${WEBSERVER_DOC_ROOT}/db.php_orj > ${WEBSERVER_DOC_ROOT}/db.php &&
4242
sed \"/^[[:space:]]\\+.cookieValidationKey/s/''/'$$(tr -dc '[:alnum:]' </dev/urandom | head -c 32)'/\" ${WEBSERVER_DOC_ROOT}/web.php_orj > ${WEBSERVER_DOC_ROOT}/web.php;
@@ -72,8 +72,6 @@ services:
7272
- yii
7373
environment:
7474
TZ: '${LOCAL_TIMEZONE}'
75-
labels:
76-
- "docker-volume-backup.stop-during-backup=true"
7775
command: bash -c "sh /tmp/ssl-conf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${HTTPD_PREFIX}/conf'"
7876

7977
certbot:
@@ -126,15 +124,13 @@ services:
126124
# - database
127125
environment:
128126
#PMA_HOST: database
129-
PMA_PMADB: phpmyadmin
127+
PMA_PMADB: 'phpmyadmin'
130128
PMA_CONTROLUSER: '${PMA_CONTROLUSER}'
131129
PMA_CONTROLPASS: '${PMA_CONTROLPASS}'
132130
MYSQL_ROOT_PASSWORD: '${MYSQL_ROOT_PASSWORD}'
133131
UPLOAD_LIMIT: '${PMA_UPLOAD_LIMIT}'
134132
MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}'
135133
TZ: '${LOCAL_TIMEZONE}'
136-
labels:
137-
- "docker-volume-backup.stop-during-backup=true"
138134
command: >
139135
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
140136
&& printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
@@ -187,8 +183,6 @@ services:
187183
environment:
188184
ALLOW_EMPTY_PASSWORD: 'yes'
189185
TZ: '${LOCAL_TIMEZONE}'
190-
labels:
191-
- "docker-volume-backup.stop-during-backup=true"
192186
command: "redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
193187

194188
backup:

0 commit comments

Comments
 (0)