| -rw-r--r-- | Jenkinsfile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index c386e7d..bbf8f09 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,8 +42,6 @@ kind: Pod metadata: namespace: jenkins spec: - nodeSelector: - kubernetes.io/arch: ${GOARCH} containers: - name: kaniko image: gcr.io/kaniko-project/executor:v1.24.0-debug @@ -126,12 +124,13 @@ spec: steps { script { env.GIT_COMMIT_SHORT = env.GIT_COMMIT ? env.GIT_COMMIT.take(7) : "unknown" - } - withCredentials([string(credentialsId: 'registry-sayagit-jenkins-password', variable: 'REGISTRY_SAYAGIT_JENKINS_PASSWORD')]) { sh '''#!/busybox/sh - mkdir -p /root/.docker - printf '{"auths":{"registry.sayag.it":{"username":"jenkins","password":"%s"}}}' "$REGISTRY_SAYAGIT_JENKINS_PASSWORD" > /root/.docker/config.json - + mkdir -p /kaniko/.docker + printf '{"auths":{"registry.sayag.it":{"username":"jenkins","password":"%s"}}}' "$REGISTRY_SAYAGIT_JENKINS_PASSWORD" > /kaniko/.docker/config.json + pushToTags="$IMAGE_PUSH_DESTINATION:commit-$GIT_COMMIT_SHORT-$GOARCH" + if [ "$TAG_NAME" != "" ]; then + pushToTags="$pushToTags $IMAGE_PUSH_DESTINATION:$TAG_NAME-$GOARCH" + fi manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ --template $IMAGE_PUSH_DESTINATION:commit-$GIT_COMMIT_SHORT-ARCH \ |