diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3df9bd62311a668850bf556be57589eeecb1728d..2e9cb16d8e0bfdf0e1db6c0f5279cf4adbd404ce 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 b2da6d34a2cbaa045e0e794b04e478b524d4db8c..7c507dfe5634e7e349f4bccaf68a1128e8dacc00 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 4e9e59041c59b994ed67fe5c26b703e81380e938..aa124ba052a8a7e6ca2e24215ec5c100b5157204 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}