This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 4825fa31cfe12813a7b0192c9f25e0ac6cd093cf Author: Benjamin <poussin@codelutin.com> Date: Wed May 6 22:35:27 2020 +0200 ajout de variable dans le docker-compose --- .gitlab-ci.yml | 6 ++++-- docker/docker-compose.yml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb5d90a..3bb8891 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,5 +19,7 @@ deploy: when: manual stage: deploy script: - - zip docker-compose.zip docker/docker-compose.yml - - curl -v -F "name=$CI_PROJECT_NAME" -F "flavour=$CI_COMMIT_REF_SLUG" -F "target=infrasaas" -F "info=$CI_COMMIT_MESSAGE" -F "composeFile=docker-compose.yml" -F "zip=@docker-compose.zip https://swarm-deployer.cloud.codelutin.com/api/v1/projects?swarm-deployer-to... + - cat docker/docker-compose.yml | envsubst > docker-compose.yml + - chmod +x docker-compose.yml + - zip docker-compose.zip docker-compose.yml + - curl -v -F "name=$CI_PROJECT_NAME" -F "flavour=$CI_COMMIT_REF_SLUG" -F "target=infrasaas" -F "info=$CI_COMMIT_MESSAGE" -F "composeFile=docker-compose.yml" -F "zip=@docker-compose.zip" "https://swarm-deployer.cloud.codelutin.com/api/v1/projects?swarm-deployer-to..." diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6b22765..adafc09 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -39,13 +39,13 @@ services: memory: 50M bow: - image: registry.nuiton.org/codelutin/chorem/bow:bow-v2-go + image: registry.nuiton.org/codelutin/chorem/bow:$CI_COMMIT_REF_SLUG networks: - traefik-net - default environment: DATABASE_URL: "postgres://dbuser:xxxxxxxx@database:5432/bow" - SECRET_KEY: f407c482-c5a2-4884-b33c-b351f67adbf6-dd384e30-b181-42e6-8e11-1e45a7115e22 + SECRET_KEY: $BOW_SECRET_KEY BOW_PUBLIC_URL: https://bookmarks.cl logging: driver: "json-file" -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.