From 4e257c8e8f810f9688c5dfbae7a6dc0b0e730696 Mon Sep 17 00:00:00 2001 From: zslavis <50221726+zslavis@users.noreply.github.com> Date: Sat, 13 Jul 2019 20:46:21 -0700 Subject: [PATCH] Update to include MARIADB_VERSION in env file which sets the mariadb version (#2185) --- docker-compose.yml | 1 + env-example | 1 + mariadb/Dockerfile | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 09d7ffb4..7edfa77c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -401,6 +401,7 @@ services: - http_proxy - https_proxy - no_proxy + - MARIADB_VERSION=${MARIADB_VERSION} volumes: - ${DATA_PATH_HOST}/mariadb:/var/lib/mysql - ${MARIADB_ENTRYPOINT_INITDB}:/docker-entrypoint-initdb.d diff --git a/env-example b/env-example index 8a754524..a7bf59bc 100644 --- a/env-example +++ b/env-example @@ -269,6 +269,7 @@ MSSQL_PORT=1433 ### MARIADB ############################################### +MARIADB_VERSION=latest MARIADB_DATABASE=default MARIADB_USER=default MARIADB_PASSWORD=secret diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 7538b4e2..1d048265 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -1,4 +1,5 @@ -FROM mariadb:latest +ARG MARIADB_VERSION=latest +FROM mariadb:${MARIADB_VERSION} LABEL maintainer="Mahmoud Zalt "