From 7259c650520c491dd1d0922f92dbf33f45c447a5 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Sat, 4 Mar 2023 14:24:38 +0100 Subject: [PATCH] Move env into run for clarity --- docker-compose.yml | 4 ++-- env/mariadb.env | 4 ---- env/service.env | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 env/mariadb.env delete mode 100644 env/service.env diff --git a/docker-compose.yml b/docker-compose.yml index 1e51ac22..e6d8777d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ x-svc: &service env_file: - - "env/service.env" + - "run/env/service.env" volumes: - vol:/vol - conf:/wmsa/conf:ro @@ -73,7 +73,7 @@ services: mariadb: image: "mariadb/server:10.3" container_name: "mariadb" - env_file: "env/mariadb.env" + env_file: "run/env/mariadb.env" command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci'] ports: - "127.0.0.1:3306:3306/tcp" diff --git a/env/mariadb.env b/env/mariadb.env deleted file mode 100644 index b7fec6ea..00000000 --- a/env/mariadb.env +++ /dev/null @@ -1,4 +0,0 @@ -MARIADB_RANDOM_ROOT_PASSWORD=1 -MARIADB_DATABASE=WMSA_prod -MARIADB_USER=wmsa -MARIADB_PASSWORD=wmsa \ No newline at end of file diff --git a/env/service.env b/env/service.env deleted file mode 100644 index fef49dae..00000000 --- a/env/service.env +++ /dev/null @@ -1 +0,0 @@ -WMSA_HOME=/home/vlofgren/Code/wmsa.local \ No newline at end of file