Skip to content

Commit b7e14c8

Browse files
committed
Log in to both the ECR and Dockerhub on the new CI
Signed-off-by: Bence Szépkúti <[email protected]>
1 parent d209b9e commit b7e14c8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

vars/gen_jobs.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ def gen_dockerfile_builder_job(String platform, boolean overwrite=false) {
734734
return job(platform) {
735735
def node_label = arch == 'amd64' ? 'dockerfile-builder' : "container-host-$arch"
736736
analysis.node_record_timestamps(node_label, platform) {
737-
if (common.is_open_ci_env) {
737+
if (common.is_open_ci_env || common.is_new_ci_env) {
738738
withCredentials([string(credentialsId: 'DOCKER_AUTH', variable: 'TOKEN')]) {
739739
sh """\
740740
mkdir -p ${env.HOME}/.docker
@@ -750,7 +750,9 @@ EOF
750750
chmod 0600 ${env.HOME}/.docker/config.json
751751
"""
752752
}
753-
} else {
753+
}
754+
755+
if (!common.is_open_ci_env) {
754756
sh """\
755757
aws ecr get-login-password --region eu-west-1 | docker login --username AWS --password-stdin $common.docker_ecr
756758
"""

0 commit comments

Comments
 (0)