From 7629d401f7532e0645dbf30afab970a7bdcef6ab Mon Sep 17 00:00:00 2001
From: Andrew Kapuscinski <akapusci@nrao.edu>
Date: Mon, 15 Mar 2021 11:21:05 -0600
Subject: [PATCH] Fixed variable interpolation issue with docker secrets
---
.gitlab-ci.yml | 5 ++++-
docker-compose.dev.yml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e23bfcfda..d93982a16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,7 +244,10 @@ pages:
deploy:
stage: deploy
script:
- - ENV=$DEPLOY_ENV TAG=$IMAGE_TAG docker stack deploy --compose-file docker-compose.dev.yml workspaces-${ENV}
+ # Docker doesn't allow variable interpolation when declaring Docker Secret names
+ # This sed command finds and replaces "dsoc_ENV_secrets:" with "dsoc_${DEPLOY_ENV}_secrets:"
+ - sed -i "s/dsoc_ENV_secrets:/dsoc_${DEPLOY_ENV}_secrets:/g" docker-compose.dev.yml
+ - ENV=$DEPLOY_ENV TAG=$IMAGE_TAG docker stack deploy --compose-file docker-compose.dev.yml workspaces-${DEPLOY_ENV}
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables:
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 2da0472e2..275693f16 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -105,7 +105,7 @@ services:
secrets:
- dsoc_${ENV}_secrets:
+ dsoc_ENV_secrets:
external: true
# schema:
# image: marconi.aoc.nrao.edu/ops/base:workspaces
--
GitLab