From 07f975dc91c5be6544ce2f77c8380d47ee553b71 Mon Sep 17 00:00:00 2001 From: Francia Csaba Date: Tue, 9 Jan 2024 14:38:44 +0100 Subject: [PATCH] #13 separated plugins repo url --- Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff5b947..7104ffa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,8 +2,9 @@ pipeline { agent any environment { GITEA_CREDS = credentials('AMARILLO-JENKINS-GITEA-USER') - TWINE_REPO_URL = "git.gerhardt.io/api/packages/amarillo/pypi" - REGISTRY_URL = 'https://git.gerhardt.io' + TWINE_REPO_URL = "https://git.gerhardt.io/api/packages/amarillo/pypi" + PLUGINS_REPO_URL = "git.gerhardt.io/api/packages/amarillo/pypi/simple" + DOCKER_REGISTRY_URL = 'https://git.gerhardt.io' OWNER = 'amarillo' IMAGE_NAME = 'amarillo' TAG = 'latest' @@ -15,7 +16,7 @@ pipeline { echo 'Building image' script { docker.build("${OWNER}/${IMAGE_NAME}:${TAG}", - "--build-arg='PACKAGE_REGISTRY_URL=${TWINE_REPO_URL}' --build-arg='PLUGINS=${PLUGINS}' --secret id=AMARILLO_REGISTRY_CREDENTIALS,env=GITEA_CREDS .") + "--build-arg='PACKAGE_REGISTRY_URL=${PLUGINS_REPO_URL}' --build-arg='PLUGINS=${PLUGINS}' --secret id=AMARILLO_REGISTRY_CREDENTIALS,env=GITEA_CREDS .") } } } @@ -23,7 +24,7 @@ pipeline { steps { echo 'Pushing image to registry' script { - docker.withRegistry(REGISTRY_URL, 'AMARILLO-JENKINS-GITEA-USER'){ + docker.withRegistry(DOCKER_REGISTRY_URL, 'AMARILLO-JENKINS-GITEA-USER'){ docker.image("${OWNER}/${IMAGE_NAME}:${TAG}").push() } }