Skip to content

Commit 4e257c8

Browse files
zslavisbestlong
authored andcommitted
Update to include MARIADB_VERSION in env file which sets the mariadb version (laradock#2185)
1 parent 01eb934 commit 4e257c8

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ services:
401401
- http_proxy
402402
- https_proxy
403403
- no_proxy
404+
- MARIADB_VERSION=${MARIADB_VERSION}
404405
volumes:
405406
- ${DATA_PATH_HOST}/mariadb:/var/lib/mysql
406407
- ${MARIADB_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d

env-example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ MSSQL_PORT=1433
269269

270270
### MARIADB ###############################################
271271

272+
MARIADB_VERSION=latest
272273
MARIADB_DATABASE=default
273274
MARIADB_USER=default
274275
MARIADB_PASSWORD=secret

mariadb/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM mariadb:latest
1+
ARG MARIADB_VERSION=latest
2+
FROM mariadb:${MARIADB_VERSION}
23

34
LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
45

0 commit comments

Comments
 (0)