Skip to content

Commit 414b3c9

Browse files
committed
Update docker-compose.yml
1 parent c4f5b61 commit 414b3c9

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 && 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 &&
3939
if [ -f \"${WEBSERVER_DOC_ROOT}/webapp/.env\" ]; then composer update --working-dir=${WEBSERVER_DOC_ROOT}/webapp; else composer create-project symfony/skeleton:"6.1.*" webapp && composer require --working-dir=${WEBSERVER_DOC_ROOT}/webapp ${SKELETON_WEBAPP}; fi;
4040
sed -i 's/DATABASE_URL=\"postgresql/# DATABASE_URL=\"postgresql/;s/# DATABASE_URL=\"mysql/DATABASE_URL=\"mysql/;s/app:/${DB_USER}:/;s/!ChangeMe!/${DB_PASSWORD}/;s/127.0.0.1/database/;s/app?/${DB_NAME}?/;s/serverVersion=.*\&charset/serverVersion=mariadb-10\&charset/' ${WEBSERVER_DOC_ROOT}/webapp/.env;
4141
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"
@@ -75,8 +75,6 @@ services:
7575
NGINX_HOST: ${DOMAIN_NAME}
7676
NGINX_PORT: 80
7777
TZ: '${LOCAL_TIMEZONE}'
78-
labels:
79-
- "docker-volume-backup.stop-during-backup=true"
8078
command: bash -c "/docker-entrypoint.sh nginx -v; sh /tmp/ssl-conf.sh '${DOMAIN_NAME}' '${LETSENCRYPT_CONF_PREFIX}' '${NGINX_PREFIX}'"
8179

8280
certbot:
@@ -129,15 +127,13 @@ services:
129127
# - database
130128
environment:
131129
#PMA_HOST: database
132-
PMA_PMADB: phpmyadmin
130+
PMA_PMADB: 'phpmyadmin'
133131
PMA_CONTROLUSER: '${PMA_CONTROLUSER}'
134132
PMA_CONTROLPASS: '${PMA_CONTROLPASS}'
135133
MYSQL_ROOT_PASSWORD: '${MYSQL_ROOT_PASSWORD}'
136134
UPLOAD_LIMIT: '${PMA_UPLOAD_LIMIT}'
137135
MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}'
138136
TZ: '${LOCAL_TIMEZONE}'
139-
labels:
140-
- "docker-volume-backup.stop-during-backup=true"
141137
command: >
142138
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
143139
&& printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
@@ -190,8 +186,6 @@ services:
190186
environment:
191187
ALLOW_EMPTY_PASSWORD: 'yes'
192188
TZ: '${LOCAL_TIMEZONE}'
193-
labels:
194-
- "docker-volume-backup.stop-during-backup=true"
195189
command: "redis-server ${REDIS_CONF_PREFIX}/redis/redis.conf"
196190

197191
backup:

0 commit comments

Comments
 (0)