Skip to content

Commit ac48a1b

Browse files
committed
Update docker-compose.yml
1 parent 66b7eaa commit ac48a1b

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
@@ -35,7 +35,7 @@ services:
3535
labels:
3636
- 'docker-volume-backup.stop-during-backup=true'
3737
command: >
38-
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 &&
38+
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; curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer &&
3939
if [ -f \"${WEBSERVER_DOC_ROOT}/webapp/.env\" ]; then composer update --working-dir=${WEBSERVER_DOC_ROOT}/webapp; else composer create-project laravel/laravel webapp && chmod -R 777 ${WEBSERVER_DOC_ROOT}/webapp/storage/framework ${WEBSERVER_DOC_ROOT}/webapp/storage/logs; fi;
4040
sed -i \"s/DB_HOST=127.0.0.1/DB_HOST=database/;s/REDIS_HOST=127.0.0.1/REDIS_HOST=redis/\" ${WEBSERVER_DOC_ROOT}/webapp/.env; 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"
4141
@@ -69,8 +69,6 @@ services:
6969
- laravel
7070
environment:
7171
TZ: '${LOCAL_TIMEZONE}'
72-
labels:
73-
- "docker-volume-backup.stop-during-backup=true"
7472
command: bash -c "sh /tmp/ssl-conf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${HTTPD_PREFIX}/conf'"
7573

7674
certbot:
@@ -123,15 +121,13 @@ services:
123121
# - database
124122
environment:
125123
#PMA_HOST: database
126-
PMA_PMADB: phpmyadmin
124+
PMA_PMADB: 'phpmyadmin'
127125
PMA_CONTROLUSER: '${PMA_CONTROLUSER}'
128126
PMA_CONTROLPASS: '${PMA_CONTROLPASS}'
129127
MYSQL_ROOT_PASSWORD: '${MYSQL_ROOT_PASSWORD}'
130128
UPLOAD_LIMIT: '${PMA_UPLOAD_LIMIT}'
131129
MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}'
132130
TZ: '${LOCAL_TIMEZONE}'
133-
labels:
134-
- "docker-volume-backup.stop-during-backup=true"
135131
command: >
136132
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
137133
&& printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
@@ -184,8 +180,6 @@ services:
184180
environment:
185181
ALLOW_EMPTY_PASSWORD: 'yes'
186182
TZ: '${LOCAL_TIMEZONE}'
187-
labels:
188-
- "docker-volume-backup.stop-during-backup=true"
189183
command: "redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
190184

191185
backup:

0 commit comments

Comments
 (0)