Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 90fc470

Browse files
committed
added create_tables.sql file for phpmyadmin
1 parent 4350b4f commit 90fc470

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

‎phpmyadmin/sql/create_tables.sql.template‎ renamed to ‎database/phpmyadmin/sql/create_tables.sql.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ USE phpmyadmin;
2424
-- --------------------------------------------------------
2525

2626
--
27-
-- Create user for phpmyadmin database
27+
-- CREATE USER IF NOT EXISTS for phpmyadmin database
2828
--
29-
CREATE USER '${PMA_CONTROLUSER}'@'%' IDENTIFIED VIA mysql_native_password USING PASSWORD('${PMA_CONTROLPASS}');
29+
CREATE USER IF NOT EXISTS '$PMA_CONTROLUSER'@'%' IDENTIFIED VIA mysql_native_password USING PASSWORD('$PMA_CONTROLPASS');
3030

3131
--
3232
-- Privileges
3333
--
3434
-- (activate this statement if necessary)
35-
GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO '${PMA_CONTROLUSER}'@'%';
35+
GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO '$PMA_CONTROLUSER'@'%';
3636

3737
-- --------------------------------------------------------
3838

‎docker-compose.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ services:
9898
- backend
9999
- frontend
100100
volumes:
101-
- 'phpmyadmin:${WEBSERVER_DOC_ROOT}/sql'
102101
- type: bind
103102
source: ./phpmyadmin/apache2/sites-available/default-ssl.conf
104103
target: '${APACHE_CONFDIR_PREFIX}/sites-available/default-ssl.conf'
@@ -131,7 +130,7 @@ services:
131130
MEMORY_LIMIT: '${PMA_MEMORY_LIMIT}'
132131
TZ: '${LOCAL_TIMEZONE}'
133132
command: >
134-
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
133+
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
135134
&& printf 'AuthType Digest\\nAuthName \"phpmyadmin\"\\nAuthDigestProvider file\\nAuthUserFile ${PMA_CONF_FOLDER}/.htpasswd\\nRequire valid-user\\n' > ${WEBSERVER_DOC_ROOT}/.htaccess && a2enmod auth_digest;
136135
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;
137136
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;
@@ -148,7 +147,7 @@ services:
148147
- type: bind
149148
source: ./database/conf.d/z-mysql.cnf
150149
target: '${MYSQL_CONF_PREFIX}/z-mysql.cnf'
151-
- 'phpmyadmin:/docker-entrypoint-initdb.d'
150+
- 'phpmyadmin-sql:/docker-entrypoint-initdb.d'
152151
hostname: database
153152
restart: unless-stopped
154153
ports:
@@ -165,7 +164,7 @@ services:
165164
- "docker-volume-backup.stop-during-backup=true"
166165
- "docker-volume-backup.archive-pre=/bin/sh -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --all-databases > /tmp/backup/db_backup_data.sql'"
167166
- "docker-volume-backup.exec-label=database"
168-
command: "--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password"
167+
command: bash -c "apt-get -y update && apt-get install -y gettext-base && export PMA_CONTROLUSER=${PMA_CONTROLUSER} export PMA_CONTROLPASS=${PMA_CONTROLPASS} && envsubst '$$PMA_CONTROLUSER,$$PMA_CONTROLPASS' < /docker-entrypoint-initdb.d/create_tables.sql.template > /docker-entrypoint-initdb.d/create_tables.sql && docker-entrypoint.sh --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password"
169168

170169
redis:
171170
image: 'redis:latest'
@@ -226,12 +225,12 @@ volumes:
226225
name: ${DATABASE_CONT_NAME}-data
227226
db-backup-data:
228227
name: ${DATABASE_CONT_NAME}-backup-data
229-
phpmyadmin:
228+
phpmyadmin-sql:
230229
name: phpmyadmin-sql
231230
driver: local
232231
driver_opts:
233232
type: none
234-
device: ${DIRECTORY_PATH}/phpmyadmin/sql
233+
device: ${DIRECTORY_PATH}/database/phpmyadmin/sql
235234
o: bind
236235
dtredis:
237236
name: redis-data

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /