ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to include MARIADB_VERSION in env file which sets the mariadb version (#2185)

This commit is contained in:
zslavis 2019-07-13 20:46:21 -07:00 committed by Shao Yu-Lung (Allen)
parent 01eb934863
commit 4e257c8e8f
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -401,6 +401,7 @@ services:
- http_proxy - http_proxy
- https_proxy - https_proxy
- no_proxy - no_proxy
- MARIADB_VERSION=${MARIADB_VERSION}
volumes: volumes:
- ${DATA_PATH_HOST}/mariadb:/var/lib/mysql - ${DATA_PATH_HOST}/mariadb:/var/lib/mysql
- ${MARIADB_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d - ${MARIADB_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d

1
env-example
View File

@ -269,6 +269,7 @@ MSSQL_PORT=1433
### MARIADB ############################################### ### MARIADB ###############################################
MARIADB_VERSION=latest
MARIADB_DATABASE=default MARIADB_DATABASE=default
MARIADB_USER=default MARIADB_USER=default
MARIADB_PASSWORD=secret MARIADB_PASSWORD=secret

3
mariadb/Dockerfile
View File

@ -1,4 +1,5 @@
FROM mariadb:latest ARG MARIADB_VERSION=latest
FROM mariadb:${MARIADB_VERSION}
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>" LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"