Skip to content

Commit eaba270

Browse files
committed
Update docker-compose.yml
1 parent f586699 commit eaba270

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ services:
9898
volumes:
9999
- type: bind
100100
source: ./phpmyadmin/apache2/sites-available/default-ssl.conf
101-
target: '${APACHE_CONFDIR}/sites-available/default-ssl.conf'
101+
target: '${APACHE_CONFDIR_PREFIX}/sites-available/default-ssl.conf'
102102
- type: bind
103103
source: ./phpmyadmin/apache2/ports.conf
104-
target: '${APACHE_CONFDIR}/ports.conf'
104+
target: '${APACHE_CONFDIR_PREFIX}/ports.conf'
105105
- type: bind
106106
source: ./phpmyadmin/ssl-option/options-ssl-apache.conf
107107
target: '${LETSENCRYPT_CONF_PREFIX}/options-ssl-apache.conf'
@@ -133,7 +133,7 @@ services:
133133
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
134134
&& printf 'AuthType Digest\nAuthName \"phpmyadmin\"\nAuthDigestProvider file\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\nRequire valid-user\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
135135
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;
136-
grep -qxF 'ServerName 127.0.0.1' ${APACHE_CONFDIR}/apache2.conf || echo -e '\nServerName 127.0.0.1' >> ${APACHE_CONFDIR}/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;
136+
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;
137137
a2enmod ssl && a2ensite default-ssl && a2dissite 000-default && /docker-entrypoint.sh 'apache2-foreground'"
138138
139139
database:

0 commit comments

Comments
 (0)