diff --git a/mysql/docker-compose.override.yml b/mysql/docker-compose.override.yml index 4add0f9..ea7a92f 100644 --- a/mysql/docker-compose.override.yml +++ b/mysql/docker-compose.override.yml @@ -1,9 +1,9 @@ services: mysql-build: - image: "mysql/mysql-server:${MYSQL_VERSION}" + image: "mysql:${MYSQL_VERSION}" profiles: ["build"] build: - context: "build-context/mysql" + context: "build-context" dockerfile: Dockerfile args: MYSQL_VERSION: "${MYSQL_VERSION}" diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml index e2a5524..9ac0884 100644 --- a/mysql/docker-compose.yml +++ b/mysql/docker-compose.yml @@ -1,6 +1,6 @@ services: mysql: - image: "mysql/mysql-server:${MYSQL_VERSION}" + image: "mysql:${MYSQL_VERSION}" container_name: "mysql-${CONTEXT}" networks: mysql-default: @@ -24,4 +24,4 @@ networks: ipam: driver: default config: - - subnet: 172.16.7.0/24 + - subnet: ${SUBNET} diff --git a/mysql/env/fully.qualified.domain.name_ctx.env.example b/mysql/env/fully.qualified.domain.name_ctx.env.example index a114e54..3437981 100644 --- a/mysql/env/fully.qualified.domain.name_ctx.env.example +++ b/mysql/env/fully.qualified.domain.name_ctx.env.example @@ -27,3 +27,7 @@ CONTEXT=loft_ent # a Dockerfile # --- # EXAMPLE_ARG_FROM_ENV_FILE=must_be_available_in_dockerfile + + + +SUBNET=10.10.10.10/24