From 1c0071281b7436ed7bdfcede6fba0dcec2f43e71 Mon Sep 17 00:00:00 2001 From: elee Date: Fri, 4 Mar 2022 04:05:35 -0600 Subject: [PATCH] maybe this will work lol --- .agola/config.jsonnet | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.agola/config.jsonnet b/.agola/config.jsonnet index 4319b5f..e0feb27 100644 --- a/.agola/config.jsonnet +++ b/.agola/config.jsonnet @@ -61,7 +61,7 @@ local task_build_push_images(name, target, push) = * file not found errors when doing COPY commands. * Workaround this buy putting all files inside /kaniko */ - local options = if !push then '--no-push' else '--destination sorintlab/%s:$AGOLA_GIT_TAG' % [target]; + local options = if !push then '--no-push' else '--destination $DOCKERURL/tux/%s:$AGOLA_GIT_TAG' % [target]; { name: name, runtime: { @@ -73,7 +73,8 @@ local task_build_push_images(name, target, push) = ], }, environment: { - DOCKERAUTH: { from_variable: 'dockerauth' }, + DOCKERAUTH: { from_variable: 'harbor-auth' }, + DOCKERURL: { from_variable: 'harbor-url' }, }, shell: '/busybox/sh', working_dir: '/kaniko', @@ -87,14 +88,14 @@ local task_build_push_images(name, target, push) = cat << EOF > /kaniko/.docker/config.json { "auths": { - "https://index.docker.io/v1/": { "auth" : "$DOCKERAUTH" } + "$DOCKERURL": { "auth" : "$DOCKERAUTH" } } } EOF |||, }, ]) + [ - { type: 'run', command: '/kaniko/executor --context=dir:///kaniko/agola --build-arg AGOLAWEB_IMAGE=sorintlab/agola-web:v0.6.0 --target %s %s' % [target, options] }, + { type: 'run', command: '/kaniko/executor --context=dir:///kaniko/agola --build-arg AGOLAWEB_IMAGE=harbor.tuxpa.in/tux/agola-web:v0.6.1 --target %s %s' % [target, options] }, ], depends: ['checkout code and save to workspace', 'integration tests', 'test docker driver'], };