From 10ea221cc90b30ba0546e5a8c85b9f8db0fba2fc Mon Sep 17 00:00:00 2001 From: bearns Date: Wed, 14 Oct 2020 20:00:33 +0300 Subject: [PATCH] Database parameters pass --- db.env | 1 - docker-compose.yml | 12 +++++++----- docker-compose.yml~ | 10 ++++++---- redmine/Dockerfile | 4 +++- redmine/Dockerfile~ | 6 ++++-- 5 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 db.env diff --git a/db.env b/db.env deleted file mode 100644 index fe9ad77..0000000 --- a/db.env +++ /dev/null @@ -1 +0,0 @@ -MYSQL_ROOT_PASSWORD=mrpassword \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9458b1a..755e7ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,17 +2,19 @@ version: '3.3' services: redmine: - build: ./redmine + build: + context: ./redmine #container_name: redmine restart: always ports: - 8080:3000 environment: + REDMINE_DB_PASSWORD: "${MYSQL_ROOT_PASSWORD}" REDMINE_DB_MYSQL: db REDMINE_SECRET_KEY_BASE: supersecretkey REDMINE_PLUGINS_MIGRATE: "true" - env_file: - - db.env + #env_file: + # - db.env volumes: - redmine-files:/usr/src/redmine/files - redmine-logs:/var/log/redmine @@ -25,8 +27,8 @@ services: restart: always environment: MYSQL_DATABASE: redmine - env_file: - - db.env + #env_file: + # - db.env volumes: - db:/var/lib/mysql diff --git a/docker-compose.yml~ b/docker-compose.yml~ index 5a348e7..575733d 100644 --- a/docker-compose.yml~ +++ b/docker-compose.yml~ @@ -2,17 +2,19 @@ version: '3.3' services: redmine: - build: ./redmine + build: + context: ./redmine #container_name: redmine restart: always ports: - 8080:3000 environment: + REDMINE_DB_PASSWORD: "${MYSQL_ROOT_PASSWORD}" REDMINE_DB_MYSQL: db REDMINE_SECRET_KEY_BASE: supersecretkey - REDMINE_PLUGINS_MIGRATE: true - env_file: - - db.env + REDMINE_PLUGINS_MIGRATE: "true" + #env_file: + # - db.env volumes: - redmine-files:/usr/src/redmine/files - redmine-logs:/var/log/redmine diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 9eb702d..1cfa06a 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,3 +1,5 @@ FROM redmine:latest -ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD} +#ARG REDMINE_DB_PASSWORD +#RUN echo "testarg=${REDMINE_DB_PASSWORD}" +#ENV REDMINE_DB_PASSWORD=${REDMINE_DB_PASSWORD} ADD ./redmine_ldap_passwd/ /usr/share/redmine/plugins/ \ No newline at end of file diff --git a/redmine/Dockerfile~ b/redmine/Dockerfile~ index 96b8441..adae00b 100644 --- a/redmine/Dockerfile~ +++ b/redmine/Dockerfile~ @@ -1,3 +1,5 @@ FROM redmine:latest -ENV REDMINE_DB_PASSWORD=${MYSQL_ROOT_PASSWORD} -COPY redmine_ldap_passwd /usr/share/redmine/plugins/ \ No newline at end of file +ARG REDMINE_DB_PASSWORD +RUN echo "testarg=${REDMINE_DB_PASSWORD}" +ENV REDMINE_DB_PASSWORD=${REDMINE_DB_PASSWORD} +ADD ./redmine_ldap_passwd/ /usr/share/redmine/plugins/ \ No newline at end of file