Skip to content

Commit c44073b

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 dc42482 commit c44073b

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
@@ -715,7 +715,7 @@ def gen_dockerfile_builder_job(String platform, boolean overwrite=false) {
715715
return job(platform) {
716716
def node_label = arch == 'amd64' ? 'dockerfile-builder' : "container-host-$arch"
717717
analysis.node_record_timestamps(node_label, platform) {
718-
if (common.is_open_ci_env) {
718+
if (common.is_open_ci_env || common.is_new_ci_env) {
719719
withCredentials([string(credentialsId: 'DOCKER_AUTH', variable: 'TOKEN')]) {
720720
sh """\
721721
mkdir -p ${env.HOME}/.docker
@@ -731,7 +731,9 @@ EOF
731731
chmod 0600 ${env.HOME}/.docker/config.json
732732
"""
733733
}
734-
} else {
734+
}
735+
736+
if (!common.is_open_ci_env) {
735737
sh """\
736738
aws ecr get-login-password --region eu-west-1 | docker login --username AWS --password-stdin $common.docker_ecr
737739
"""

0 commit comments

Comments
 (0)