From b8ced776d1c0859830c1f5412306fefa15891114 Mon Sep 17 00:00:00 2001
From: Josh Wolf <josh@joshwolf.dev>
Date: Thu, 20 May 2021 13:46:10 -0600
Subject: [PATCH] :eyes:
---
.gitlab-ci.yml | 2 +-
scripts/deploy/00_deploy_flux.sh | 2 +-
scripts/deploy/01_deploy_bigbang.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3df9bd6231..2e9cb16d8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -348,7 +348,7 @@ package:
before_script:
# Set up auth
- mkdir -p /root/.docker
- - echo $DOCKER_AUTH_CONFIG | base64 -d - > /root/.docker/config.json
+ - echo $DOCKER_AUTH_CONFIG > /root/.docker/config.json
script:
- cp ./scripts/package/synker.yaml ./synker.yaml
# Populate images list in synker config
diff --git a/scripts/deploy/00_deploy_flux.sh b/scripts/deploy/00_deploy_flux.sh
index b2da6d34a2..7c507dfe56 100644
--- a/scripts/deploy/00_deploy_flux.sh
+++ b/scripts/deploy/00_deploy_flux.sh
@@ -5,5 +5,5 @@ set -ex
# install flux with the dedicated helper script
./scripts/install_flux.sh \
--registry-username 'robot$bb-dev-imagepullonly' \
- --registry-password "$(echo "$REGISTRY1_PASSWORD" | base64 -d -)" \
+ --registry-password "${REGISTRY1_PASSWORD}" \
--registry-email bigbang@bigbang.dev
\ No newline at end of file
diff --git a/scripts/deploy/01_deploy_bigbang.sh b/scripts/deploy/01_deploy_bigbang.sh
index 4e9e59041c..aa124ba052 100755
--- a/scripts/deploy/01_deploy_bigbang.sh
+++ b/scripts/deploy/01_deploy_bigbang.sh
@@ -29,7 +29,7 @@ cat $CI_VALUES_FILE
helm upgrade -i bigbang chart -n bigbang --create-namespace \
--set registryCredentials[0].username='robot$bb-dev-imagepullonly' \
- --set registryCredentials[0].password="$( echo "$REGISTRY1_PASSWORD" | base64 -d -)" \
+ --set registryCredentials[0].password="${REGISTRY1_PASSWORD}" \
--set registryCredentials[0].registry=registry1.dso.mil \
-f ${CI_VALUES_FILE}
--
GitLab