From 68701e4ae7aae12c4a3ae984b6ed183720cb3ad7 Mon Sep 17 00:00:00 2001 From: Michael Hiiva Date: Tue, 5 Jan 2021 00:02:58 +0000 Subject: [PATCH 1/6] Shortened copy for scripts. --- Dockerfile.python3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.python3 b/Dockerfile.python3 index abf96b33..3a93b41b 100644 --- a/Dockerfile.python3 +++ b/Dockerfile.python3 @@ -40,7 +40,7 @@ ENV DJANGO_SETTINGS_MODULE=agagd.settings.prod ENV PROJECT_ROOT=/srv ENV TEMPLATE_DIR=/srv/templates -COPY --chown=django:django scripts/entrypoint.sh scripts/make_fake_fixures.py agagd/ /srv/ +COPY --chown=django:django scripts/ agagd/ /srv/ RUN SECRET_KEY=stub-for-build python manage.py collectstatic --noinput CMD ["/srv/entrypoint.sh"] From 405675615774b7d12c74a4c3d5081a6dc4ee62a6 Mon Sep 17 00:00:00 2001 From: Michael Hiiva Date: Tue, 5 Jan 2021 00:03:47 +0000 Subject: [PATCH 2/6] Shortened copy for scripts in Dockerfile. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8b22e2b4..eb969d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ ENV DJANGO_SETTINGS_MODULE=agagd.settings.prod ENV PROJECT_ROOT=/srv ENV TEMPLATE_DIR=/srv/templates -COPY --chown=django:django scripts/entrypoint.sh scripts/make_fake_fixtures.py agagd/ /srv/ +COPY --chown=django:django scripts/ agagd/ /srv/ RUN SECRET_KEY=stub-for-build python manage.py collectstatic --noinput CMD ["/srv/entrypoint.sh"] From be7aed9dbf7dbed85071784f90db53e56259f0a6 Mon Sep 17 00:00:00 2001 From: Michael Hiiva Date: Tue, 5 Jan 2021 00:04:34 +0000 Subject: [PATCH 3/6] Added context to docker-compose for python3. --- docker-compose-python3.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose-python3.yml b/docker-compose-python3.yml index 37084a62..a22e7803 100644 --- a/docker-compose-python3.yml +++ b/docker-compose-python3.yml @@ -12,7 +12,9 @@ version: '3.5' services: app: - build: ./Dockerfile.python3 + build: + context: ./ + dockerfile: Dockerfile.python3 restart: always ports: - "8000:3031" From 7d716c8138e126cd044c9f8e2a5e8d545dce1514 Mon Sep 17 00:00:00 2001 From: Michael Hiiva Date: Tue, 5 Jan 2021 00:20:22 +0000 Subject: [PATCH 4/6] Replaced docker-config.env with default env. --- .env | 3 +++ .gitignore | 1 - config-docker.env.sample | 2 -- docker-compose-python3.yml | 4 ---- docker-compose.yml | 4 ---- docs/docker.md | 6 +----- 6 files changed, 4 insertions(+), 16 deletions(-) create mode 100644 .env delete mode 100644 config-docker.env.sample diff --git a/.env b/.env new file mode 100644 index 00000000..8eebf63b --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +MYSQL_PASS=agagd_insecure_pass +MYSQL_PASSWORD=agagd_insecure_pass +MYSQL_ROOT_PASSWORD=agagd_insecure_root_pass diff --git a/.gitignore b/.gitignore index 6fd6aaf0..88737111 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ .DS_Store agagd/agagdbak/* agagd_core/fixtures/fake_data.json -config-docker.env docker-compose.override.yml local_settings.py schema.sql diff --git a/config-docker.env.sample b/config-docker.env.sample deleted file mode 100644 index df0f4ede..00000000 --- a/config-docker.env.sample +++ /dev/null @@ -1,2 +0,0 @@ -MYSQL_PASSWORD= -MYSQL_ROOT_PASSWORD= diff --git a/docker-compose-python3.yml b/docker-compose-python3.yml index a22e7803..db6ad78f 100644 --- a/docker-compose-python3.yml +++ b/docker-compose-python3.yml @@ -18,8 +18,6 @@ services: restart: always ports: - "8000:3031" - env_file: - config-docker.env environment: DB_HOST: db DB_PORT: 3306 @@ -36,8 +34,6 @@ services: restart: always volumes: - database:/var/lib/mysql - env_file: - config-docker.env environment: # this is safer than it looks, since without a 'ports' section, docker-compose # isolates this app to a network local to this compose file. diff --git a/docker-compose.yml b/docker-compose.yml index 0e3cf71c..f77a2d7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,8 +16,6 @@ services: restart: always ports: - "8000:3031" - env_file: - config-docker.env environment: DB_HOST: db DB_PORT: 3306 @@ -34,8 +32,6 @@ services: restart: always volumes: - database:/var/lib/mysql - env_file: - config-docker.env environment: # this is safer than it looks, since without a 'ports' section, docker-compose # isolates this app to a network local to this compose file. diff --git a/docs/docker.md b/docs/docker.md index ba0ab6e8..e7247f28 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -14,11 +14,7 @@ Docker can automate much of the configuration for you. ### Running a dev environment using Docker -Copy `config-docker.env.sample` to `config-docker.env` (in the repository root) and edit the file to provide values for the variables. - -~~~ -$ cp config-docker.env.sample config-docker.env -~~~ +If you wish to change the environmental variables, the `.env` file to provides values for the environmental variables. Additional information about how docker-compose uses env-files can be found on [Environmental File](https://docs.docker.com/compose/env-file/). These values will be used by both the database and the app. Now, run either: From 82216eb64eacf356d384fc5dbc2ebf5c36eb1183 Mon Sep 17 00:00:00 2001 From: Michael Hiiva Date: Tue, 5 Jan 2021 01:24:26 +0000 Subject: [PATCH 5/6] Added environmental variables to docker-compose files. --- docker-compose-python3.yml | 4 ++++ docker-compose.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/docker-compose-python3.yml b/docker-compose-python3.yml index db6ad78f..9ed8d7f1 100644 --- a/docker-compose-python3.yml +++ b/docker-compose-python3.yml @@ -23,6 +23,8 @@ services: DB_PORT: 3306 APP_DB_NAME: agagd AGAGD_USER: agagd + MYSQL_PASS: "${MYSQL_PASS}" + MYSQL_PASSWORD: "${MYSQL_PASS}" SECRET_KEY: insecure-key-for-testing DEBUG: "true" LOAD_FIXTURES: "true" @@ -38,8 +40,10 @@ services: # this is safer than it looks, since without a 'ports' section, docker-compose # isolates this app to a network local to this compose file. MYSQL_ROOT_HOST: "%" + MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}" MYSQL_USER: agagd MYSQL_DATABASE: agagd + MYSQL_PASS: "${MYSQL_PASS}" volumes: database: diff --git a/docker-compose.yml b/docker-compose.yml index f77a2d7e..5b29c307 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,8 @@ services: DB_PORT: 3306 APP_DB_NAME: agagd AGAGD_USER: agagd + MYSQL_PASS: "${MYSQL_PASS}" + MYSQL_PASSWORD: "${MYSQL_PASS}" SECRET_KEY: insecure-key-for-testing DEBUG: "true" LOAD_FIXTURES: "true" @@ -36,8 +38,10 @@ services: # this is safer than it looks, since without a 'ports' section, docker-compose # isolates this app to a network local to this compose file. MYSQL_ROOT_HOST: "%" + MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}" MYSQL_USER: agagd MYSQL_DATABASE: agagd + MYSQL_PASS: "${MYSQL_PASS}" volumes: database: From 8e7aa8d288e4c6c5e4eddc7e39214af607be124b Mon Sep 17 00:00:00 2001 From: Michael Hiiva Date: Thu, 21 Jan 2021 09:27:29 +0000 Subject: [PATCH 6/6] Corrected MYSQL_PASSWORD for docker-compose.yml files. --- .env | 1 - docker-compose-python3.yml | 5 ++--- docker-compose.yml | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.env b/.env index 8eebf63b..f1f4eaac 100644 --- a/.env +++ b/.env @@ -1,3 +1,2 @@ -MYSQL_PASS=agagd_insecure_pass MYSQL_PASSWORD=agagd_insecure_pass MYSQL_ROOT_PASSWORD=agagd_insecure_root_pass diff --git a/docker-compose-python3.yml b/docker-compose-python3.yml index 9ed8d7f1..a34543bc 100644 --- a/docker-compose-python3.yml +++ b/docker-compose-python3.yml @@ -23,8 +23,7 @@ services: DB_PORT: 3306 APP_DB_NAME: agagd AGAGD_USER: agagd - MYSQL_PASS: "${MYSQL_PASS}" - MYSQL_PASSWORD: "${MYSQL_PASS}" + MYSQL_PASSWORD: "${MYSQL_PASSWORD}" SECRET_KEY: insecure-key-for-testing DEBUG: "true" LOAD_FIXTURES: "true" @@ -43,7 +42,7 @@ services: MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}" MYSQL_USER: agagd MYSQL_DATABASE: agagd - MYSQL_PASS: "${MYSQL_PASS}" + MYSQL_PASSWORD: "${MYSQL_PASSWORD}" volumes: database: diff --git a/docker-compose.yml b/docker-compose.yml index 5b29c307..f61cff35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,8 +21,7 @@ services: DB_PORT: 3306 APP_DB_NAME: agagd AGAGD_USER: agagd - MYSQL_PASS: "${MYSQL_PASS}" - MYSQL_PASSWORD: "${MYSQL_PASS}" + MYSQL_PASSWORD: "${MYSQL_PASSWORD}" SECRET_KEY: insecure-key-for-testing DEBUG: "true" LOAD_FIXTURES: "true" @@ -41,7 +40,7 @@ services: MYSQL_ROOT_PASSWORD: "${MYSQL_ROOT_PASSWORD}" MYSQL_USER: agagd MYSQL_DATABASE: agagd - MYSQL_PASS: "${MYSQL_PASS}" + MYSQL_PASSWORD: "${MYSQL_PASSWORD}" volumes: database: