Skip to content

Commit e3fe153

Browse files
committed
added create_tables.sql for phpmyadmin
1 parent 3abfb12 commit e3fe153

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ services:
144144
restart: unless-stopped
145145
ports:
146146
- '9090:443'
147-
#links:
148-
# - database
147+
links:
148+
- database
149149
environment:
150-
#PMA_HOST: database
150+
PMA_HOST: 'database'
151151
PMA_PMADB: 'phpmyadmin'
152152
PMA_CONTROLUSER: '${PMA_CONTROLUSER}'
153153
PMA_CONTROLPASS: '${PMA_CONTROLPASS}'
@@ -156,7 +156,7 @@ services:
156156
MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}'
157157
TZ: '${LOCAL_TIMEZONE}'
158158
command: >
159-
bash -c "envsubst < ${PMA_CONF_FOLDER}/sql/create_tables.txt > ${PMA_CONF_FOLDER}/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
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
160160
&& printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
161161
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;
162162
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;

webserver/extra/httpd-vhosts.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ServerAdmin admin@example.com
3939
ErrorLog "/usr/local/apache2/logs/example.com.error_log"
4040
TransferLog "/usr/local/apache2/logs/access_log"
4141

42-
Protocols h2 http/1.1
42+
# Protocols h2 http/1.1
4343

4444
<Directory />
4545
Options FollowSymLinks

0 commit comments

Comments
 (0)