diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e9cb16d8e0bfdf0e1db6c0f5279cf4adbd404ce..3df9bd62311a668850bf556be57589eeecb1728d 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 > /root/.docker/config.json + - echo $DOCKER_AUTH_CONFIG | base64 -d - > /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 e830e35eadafd3dc45725b614aab7b3fb00650f4..b2da6d34a2cbaa045e0e794b04e478b524d4db8c 100644 --- a/scripts/deploy/00_deploy_flux.sh +++ b/scripts/deploy/00_deploy_flux.sh @@ -4,6 +4,6 @@ set -ex # install flux with the dedicated helper script ./scripts/install_flux.sh \ - --registry-username 'robot$bigbang' \ - --registry-password "$REGISTRY1_PASSWORD" \ + --registry-username 'robot$bb-dev-imagepullonly' \ + --registry-password "$(echo "$REGISTRY1_PASSWORD" | base64 -d -)" \ --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 84eea5176e8f2310898074953e28d44d27a22090..4e9e59041c59b994ed67fe5c26b703e81380e938 100755 --- a/scripts/deploy/01_deploy_bigbang.sh +++ b/scripts/deploy/01_deploy_bigbang.sh @@ -28,8 +28,8 @@ echo "Installing BigBang with the following configurations:" cat $CI_VALUES_FILE helm upgrade -i bigbang chart -n bigbang --create-namespace \ - --set registryCredentials[0].username='robot$bigbang' \ - --set registryCredentials[0].password="$REGISTRY1_PASSWORD" \ + --set registryCredentials[0].username='robot$bb-dev-imagepullonly' \ + --set registryCredentials[0].password="$( echo "$REGISTRY1_PASSWORD" | base64 -d -)" \ --set registryCredentials[0].registry=registry1.dso.mil \ -f ${CI_VALUES_FILE}