@@ -54,11 +54,12 @@ services:
5454        hostname : webserver 
5555        restart : unless-stopped 
5656        ports :
57-             - ' 8080:8080 ' 
57+             - ' 8080:80 ' 
5858        links :
5959            - laravel 
6060        environment :
6161            TZ : ' ${LOCAL_TIMEZONE}' 
62+         command : bash -c "sed -i 's/example.com/${DOMAIN_NAME}/g' ${HTTPD_PREFIX}/conf/extra/httpd-vhosts.conf && httpd -t; httpd-foreground" 
6263
6364    certbot :
6465        depends_on :
@@ -122,6 +123,7 @@ services:
122123            - backend 
123124            - frontend 
124125        volumes :
126+             - ' phpmyadmin:${WEBSERVER_DOC_ROOT}/sql' 
125127            - type : bind 
126128              source : ./phpmyadmin/apache2/sites-available/default-ssl.conf 
127129              target : ' ${APACHE_CONFDIR_PREFIX}/sites-available/default-ssl.conf' 
@@ -142,10 +144,10 @@ services:
142144        restart : unless-stopped 
143145        ports :
144146            - ' 9090:443' 
145-         # links:
146-         #     - database
147+         links :
148+             - database 
147149        environment :
148-             # PMA_HOST: database
150+             PMA_HOST : ' database' 
149151            PMA_PMADB : ' phpmyadmin' 
150152            PMA_CONTROLUSER : ' ${PMA_CONTROLUSER}' 
151153            PMA_CONTROLPASS : ' ${PMA_CONTROLPASS}' 
@@ -154,7 +156,7 @@ services:
154156            MEMORY_LIMIT : ' ${PMA_MEMORY_LIMIT}' 
155157            TZ : ' ${LOCAL_TIMEZONE}' 
156158        command : > 
157-             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  
159+             bash -c "apt-get -y update && apt-get install -y gettext-base && envsubst < ${WEBSERVER_DOC_ROOT}/sql/create_tables.sql.template > ${WEBSERVER_DOC_ROOT}/sql/create_tables.sql &&  echo ${PMA_HTPASSWD_USERNAME}:phpmyadmin:$$( printf \"%s:%s:%s\" \"${PMA_HTPASSWD_USERNAME}\" \"phpmyadmin\" \"${PMA_HTPASSWD_PASSWORD}\" | md5sum | awk '{print $$1}' ) > ${PMA_CONF_FOLDER}/.htpasswd  
158160            && printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;  
159161            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;  
160162            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;  
@@ -171,6 +173,7 @@ services:
171173            - type : bind 
172174              source : ./database/conf.d/z-mysql.cnf 
173175              target : ' ${MYSQL_CONF_PREFIX}/z-mysql.cnf' 
176+             - ' phpmyadmin:/docker-entrypoint-initdb.d' 
174177        hostname : database 
175178        restart : unless-stopped 
176179        ports :
@@ -248,6 +251,13 @@ volumes:
248251        name : ${DATABASE_CONT_NAME}-data 
249252    db-backup-data :
250253        name : ${DATABASE_CONT_NAME}-backup-data 
254+     phpmyadmin :
255+         name : phpmyadmin-sql 
256+         driver : local 
257+         driver_opts :
258+             type : none 
259+             device : ${DIRECTORY_PATH}/phpmyadmin/sql 
260+             o : bind 
251261    dtredis :
252262        name : redis-data 
253263    certbot-etc :
0 commit comments