This is an automated email from the ASF dual-hosted git repository.
tiagobento pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git
The following commit(s) were added to refs/heads/main by this push:
new 14b412a77fa NO-ISSUE: Fix pushing KIE Tools images to dockerhub (#2419)
14b412a77fa is described below
commit 14b412a77faf22395601365c6382ebc64b929dab
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Tue Jun 11 10:29:25 2024 -0300
NO-ISSUE: Fix pushing KIE Tools images to dockerhub (#2419)
---
.ci/jenkins/Jenkinsfile.daily-dev-publish | 45 ++++++++++++++--------
.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build | 13 +++++--
.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy | 3 +-
.../Jenkinsfile.dashbuilder-viewer-image | 3 +-
.../Jenkinsfile.dev-deployment-base-image | 3 +-
...enkinsfile.dev-deployment-dmn-form-webapp-image | 3 +-
...e.dev-deployment-kogito-quarkus-blank-app-image | 3 +-
.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox | 3 +-
.../Jenkinsfile.kie-sandbox-extended-services | 3 +-
.../Jenkinsfile.kogito-management-console | 3 +-
.../Jenkinsfile.kogito-serverless-operator | 3 +-
.../release-jobs/Jenkinsfile.kogito-swf-builder | 3 +-
.../release-jobs/Jenkinsfile.kogito-swf-devmode | 3 +-
.../release-jobs/Jenkinsfile.kogito-task-console | 3 +-
...e.serverless-logic-web-tools-base-builder-image | 3 +-
...le.serverless-logic-web-tools-swf-builder-image | 3 +-
...e.serverless-logic-web-tools-swf-dev-mode-image | 3 +-
.ci/jenkins/shared-scripts/dockerUtils.groovy | 16 +++++---
18 files changed, 79 insertions(+), 40 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish
b/.ci/jenkins/Jenkinsfile.daily-dev-publish
index 4c4a49598de..77e743005a0 100644
--- a/.ci/jenkins/Jenkinsfile.daily-dev-publish
+++ b/.ci/jenkins/Jenkinsfile.daily-dev-publish
@@ -238,7 +238,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SONATAFLOW_BUILDER_IMAGE__registry}/${env.SONATAFLOW_BUILDER_IMAGE__account}",
+ "${env.SONATAFLOW_BUILDER_IMAGE__registry}",
+ "${env.SONATAFLOW_BUILDER_IMAGE__account}",
"${env.SONATAFLOW_BUILDER_IMAGE__name}",
"${env.SONATAFLOW_BUILDER_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -252,7 +253,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SONATAFLOW_DEVMODE_IMAGE__registry}/${env.SONATAFLOW_DEVMODE_IMAGE__account}",
+ "${env.SONATAFLOW_DEVMODE_IMAGE__registry}",
+ "${env.SONATAFLOW_DEVMODE_IMAGE__account}",
"${env.SONATAFLOW_DEVMODE_IMAGE__name}",
"${env.SONATAFLOW_DEVMODE_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -266,7 +268,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SONATAFLOW_OPERATOR__registry}/${env.SONATAFLOW_OPERATOR__account}",
+ "${env.SONATAFLOW_OPERATOR__registry}",
+ "${env.SONATAFLOW_OPERATOR__account}",
"${env.SONATAFLOW_OPERATOR__name}",
"${env.SONATAFLOW_OPERATOR__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -280,7 +283,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_BASE_IMAGE__registry}/${env.DEV_DEPLOYMENT_BASE_IMAGE__account}",
+ "${env.DEV_DEPLOYMENT_BASE_IMAGE__registry}",
+ "${env.DEV_DEPLOYMENT_BASE_IMAGE__account}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__name}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -294,7 +298,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry}/${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account}",
+
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry}",
+ "${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -308,7 +313,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}/${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
+
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}",
+
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -322,7 +328,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry}/${env.KIE_SANDBOX_EXTENDED_SERVICES__imageAccount}",
+ "${env.KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry}",
+ "${env.KIE_SANDBOX_EXTENDED_SERVICES__imageAccount}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageName}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -354,7 +361,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.CORS_PROXY_IMAGE__imageRegistry}/${env.CORS_PROXY_IMAGE__imageAccount}",
+ "${env.CORS_PROXY_IMAGE__imageRegistry}",
+ "${env.CORS_PROXY_IMAGE__imageAccount}",
"${env.CORS_PROXY_IMAGE__imageName}",
"${env.CORS_PROXY_IMAGE__imageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -386,7 +394,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageRegistry}/${env.KIE_SANDBOX_WEBAPP_IMAGE__imageAccount}",
+ "${env.KIE_SANDBOX_WEBAPP_IMAGE__imageRegistry}",
+ "${env.KIE_SANDBOX_WEBAPP_IMAGE__imageAccount}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageName}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -426,7 +435,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -440,7 +450,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -454,7 +465,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -468,7 +480,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DASHBUILDER__viewerImageRegistry}/${env.DASHBUILDER__viewerImageAccount}",
+ "${env.DASHBUILDER__viewerImageRegistry}",
+ "${env.DASHBUILDER__viewerImageAccount}",
"${env.DASHBUILDER__viewerImageName}",
"${env.DASHBUILDER__viewerImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -482,7 +495,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KOGITO_TASK_CONSOLE__registry}/${env.KOGITO_TASK_CONSOLE__account}",
+ "${env.KOGITO_TASK_CONSOLE__registry}",
+ "${env.KOGITO_TASK_CONSOLE__account}",
"${env.KOGITO_TASK_CONSOLE__name}",
"${env.KOGITO_TASK_CONSOLE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
@@ -496,7 +510,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KOGITO_MANAGEMENT_CONSOLE__registry}/${env.KOGITO_MANAGEMENT_CONSOLE__account}",
+ "${env.KOGITO_MANAGEMENT_CONSOLE__registry}",
+ "${env.KOGITO_MANAGEMENT_CONSOLE__account}",
"${env.KOGITO_MANAGEMENT_CONSOLE__name}",
"${env.KOGITO_MANAGEMENT_CONSOLE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
index 2dedae60eeb..15c4952fbe3 100644
--- a/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
+++ b/.ci/jenkins/ci-jobs/Jenkinsfile.ci-image-build
@@ -22,9 +22,10 @@ pipeline {
}
environment {
- IMAGE_ACCOUNT = 'docker.io/apache'
+ IMAGE_REGISTRY = 'docker.io'
+ IMAGE_ACCOUNT = 'apache'
IMAGE_NAME = 'incubator-kie-tools-ci-build'
- IMAGE_NAME_TAG = "${IMAGE_ACCOUNT}/${IMAGE_NAME}:${params.IMAGE_TAG}"
+ IMAGE_NAME_TAG =
"${IMAGE_REGISTRY}/${IMAGE_ACCOUNT}/${IMAGE_NAME}:${params.IMAGE_TAG}"
DOCKER_CONFIG = "${WORKSPACE}/.docker"
}
@@ -70,6 +71,7 @@ pipeline {
steps {
script {
IMAGE_EXISTS = dockerUtils.checkImageExistsInRegistry(
+ "${IMAGE_REGISTRY}",
"${IMAGE_ACCOUNT}",
"${IMAGE_NAME}",
"${params.IMAGE_TAG}",
@@ -96,7 +98,7 @@ pipeline {
"""
IMAGE_TAGS = "${params.IMAGE_TAG} latest"
} else {
- sh "docker build -t ${IMAGE_NAME_TAG} --label
'quay.expires-after=1d' -f .ci/incubator-kie-tools-ci-build.Dockerfile ."
+ sh "docker build -t ${IMAGE_NAME_TAG} -f
.ci/incubator-kie-tools-ci-build.Dockerfile ."
IMAGE_TAGS = "${params.IMAGE_TAG}"
}
}
@@ -111,10 +113,12 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
+ "${IMAGE_REGISTRY}",
"${IMAGE_ACCOUNT}",
"${IMAGE_NAME}",
"${IMAGE_TAGS}",
- "${pipelineVars.quayPushCredentialsId}"
+ "${pipelineVars.dockerHubUserCredentialsId}",
+ "${pipelineVars.dockerHubTokenCredentialsId}"
)
}
}
@@ -135,6 +139,7 @@ pipeline {
npm --version
pnpm --version
python --version
+ docker --version
helm version
go version
'''.trim()
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
index 6a2e4f42e1c..69968eee694 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.cors-proxy
@@ -145,7 +145,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.CORS_PROXY_IMAGE__imageRegistry}/${env.CORS_PROXY_IMAGE__imageAccount}",
+ "${env.CORS_PROXY_IMAGE__imageRegistry}",
+ "${env.CORS_PROXY_IMAGE__imageAccount}",
"${env.CORS_PROXY_IMAGE__imageName}",
"${env.CORS_PROXY_IMAGE__imageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
b/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
index 674d6c4c8b9..6a2c368ce45 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.dashbuilder-viewer-image
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DASHBUILDER__viewerImageRegistry}/${env.DASHBUILDER__viewerImageAccount}",
+ "${env.DASHBUILDER__viewerImageRegistry}",
+ "${env.DASHBUILDER__viewerImageAccount}",
"${env.DASHBUILDER__viewerImageName}",
"${env.DASHBUILDER__viewerImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
index 68ea4c926e1..cd807574491 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-base-image
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_BASE_IMAGE__registry}/${env.DEV_DEPLOYMENT_BASE_IMAGE__account}",
+ "${env.DEV_DEPLOYMENT_BASE_IMAGE__registry}",
+ "${env.DEV_DEPLOYMENT_BASE_IMAGE__account}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__name}",
"${env.DEV_DEPLOYMENT_BASE_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git
a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image
index 1e85b6f98c5..af5f01b0f48 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-dmn-form-webapp-image
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry}/${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account}",
+
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__registry}",
+ "${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_DMN_FORM_WEBAPP_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git
a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image
index f59b822caf7..2ea86b8fdeb 100644
---
a/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image
+++
b/.ci/jenkins/release-jobs/Jenkinsfile.dev-deployment-kogito-quarkus-blank-app-image
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}/${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
+
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__registry}",
+
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__account}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__name}",
"${env.DEV_DEPLOYMENT_KOGITO_QUARKUS_BLANK_APP_IMAGE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
index adb686fe7cd..a2fed5c4f11 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox
@@ -161,7 +161,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageRegistry}/${env.KIE_SANDBOX_WEBAPP_IMAGE__imageAccount}",
+ "${env.KIE_SANDBOX_WEBAPP_IMAGE__imageRegistry}",
+ "${env.KIE_SANDBOX_WEBAPP_IMAGE__imageAccount}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageName}",
"${env.KIE_SANDBOX_WEBAPP_IMAGE__imageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
index a256181892d..80178ceff84 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kie-sandbox-extended-services
@@ -145,7 +145,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry}/${env.KIE_SANDBOX_EXTENDED_SERVICES__imageAccount}",
+ "${env.KIE_SANDBOX_EXTENDED_SERVICES__imageRegistry}",
+ "${env.KIE_SANDBOX_EXTENDED_SERVICES__imageAccount}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageName}",
"${env.KIE_SANDBOX_EXTENDED_SERVICES__imageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
index f915c2ef766..86bd30540bf 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-management-console
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KOGITO_MANAGEMENT_CONSOLE__registry}/${env.KOGITO_MANAGEMENT_CONSOLE__account}",
+ "${env.KOGITO_MANAGEMENT_CONSOLE__registry}",
+ "${env.KOGITO_MANAGEMENT_CONSOLE__account}",
"${env.KOGITO_MANAGEMENT_CONSOLE__name}",
"${env.KOGITO_MANAGEMENT_CONSOLE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
index 308bce27de0..e744f9a8802 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-serverless-operator
@@ -171,7 +171,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SONATAFLOW_OPERATOR__registry}/${env.SONATAFLOW_OPERATOR__account}",
+ "${env.SONATAFLOW_OPERATOR__registry}",
+ "${env.SONATAFLOW_OPERATOR__account}",
"${env.SONATAFLOW_OPERATOR__name}",
"${env.SONATAFLOW_OPERATOR__buildTag} latest",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
index 15b66cc378f..6acb81c0598 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-builder
@@ -153,7 +153,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SONATAFLOW_BUILDER_IMAGE__registry}/${env.SONATAFLOW_BUILDER_IMAGE__account}",
+ "${env.SONATAFLOW_BUILDER_IMAGE__registry}",
+ "${env.SONATAFLOW_BUILDER_IMAGE__account}",
"${env.SONATAFLOW_BUILDER_IMAGE__name}",
"${env.SONATAFLOW_BUILDER_IMAGE__buildTag} latest",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
index 5beeb953f6f..1180e625fd2 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-swf-devmode
@@ -153,7 +153,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SONATAFLOW_DEVMODE_IMAGE__registry}/${env.SONATAFLOW_DEVMODE_IMAGE__account}",
+ "${env.SONATAFLOW_DEVMODE_IMAGE__registry}",
+ "${env.SONATAFLOW_DEVMODE_IMAGE__account}",
"${env.SONATAFLOW_DEVMODE_IMAGE__name}",
"${env.SONATAFLOW_DEVMODE_IMAGE__buildTag} latest",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
index 9ebc8427f39..3dc1c6174c3 100644
--- a/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
+++ b/.ci/jenkins/release-jobs/Jenkinsfile.kogito-task-console
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.KOGITO_TASK_CONSOLE__registry}/${env.KOGITO_TASK_CONSOLE__account}",
+ "${env.KOGITO_TASK_CONSOLE__registry}",
+ "${env.KOGITO_TASK_CONSOLE__account}",
"${env.KOGITO_TASK_CONSOLE__name}",
"${env.KOGITO_TASK_CONSOLE__buildTag}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
index 82a748cf428..2face5f95b4 100644
---
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
+++
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-base-builder-image
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageRegistry}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__baseBuilderImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image
index 71f5e052b1c..e1e7a904973 100644
---
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image
+++
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-builder-image
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageRegistry}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfBuilderImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image
index e3861299405..26208d02a10 100644
---
a/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image
+++
b/.ci/jenkins/release-jobs/Jenkinsfile.serverless-logic-web-tools-swf-dev-mode-image
@@ -140,7 +140,8 @@ pipeline {
steps {
script {
dockerUtils.pushImageToRegistry(
-
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry}/${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageRegistry}",
+
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageAccount}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageName}",
"${env.SERVERLESS_LOGIC_WEB_TOOLS__swfDevModeImageBuildTags}",
"${pipelineVars.dockerHubUserCredentialsId}",
diff --git a/.ci/jenkins/shared-scripts/dockerUtils.groovy
b/.ci/jenkins/shared-scripts/dockerUtils.groovy
index 3767ae75221..9631777b42e 100644
--- a/.ci/jenkins/shared-scripts/dockerUtils.groovy
+++ b/.ci/jenkins/shared-scripts/dockerUtils.groovy
@@ -18,13 +18,15 @@
/**
* Push an image to a given registry
*/
-def pushImageToRegistry(String registry, String image, String tags, String
userCredentialsId, String tokenCredentialsId) {
+def pushImageToRegistry(String registry, String account, String image, String
tags, String userCredentialsId, String tokenCredentialsId) {
withCredentials([string(credentialsId: userCredentialsId, variable:
'DOCKER_USER')]) {
withCredentials([string(credentialsId: tokenCredentialsId, variable:
'DOCKER_TOKEN')]) {
- sh "set +x && docker login -u $DOCKER_USER -p $DOCKER_TOKEN
$registry"
+ sh """
+ echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_USER}"
--password-stdin $registry
+ """.trim()
tagList = tags.split(' ')
for (tag in tagList) {
- sh "docker push $registry/$image:$tag"
+ sh "docker push $registry/$account/$image:$tag"
}
sh 'docker logout'
}
@@ -34,12 +36,14 @@ def pushImageToRegistry(String registry, String image,
String tags, String userC
/**
* @return bool image exists in a given registry
*/
-def checkImageExistsInRegistry(String registry, String image, String tag,
String userCredentialsId, String tokenCredentialsId) {
+def checkImageExistsInRegistry(String registry, String account, String image,
String tag, String userCredentialsId, String tokenCredentialsId) {
withCredentials([string(credentialsId: userCredentialsId, variable:
'DOCKER_USER')]) {
withCredentials([string(credentialsId: tokenCredentialsId, variable:
'DOCKER_TOKEN')]) {
- sh "set +x && docker login -u $DOCKER_USER -p $DOCKER_TOKEN
$registry"
+ sh """
+ echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_USER}"
--password-stdin $registry
+ """.trim()
result = sh returnStatus: true, script: """
- docker manifest inspect $registry/$image:$tag > /dev/null 2>&1
+ docker manifest inspect $registry/$account/$image:$tag > /dev/null
2>&1
""".trim()
sh 'docker logout'
return result == 0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
