diff --git a/container-publish.gitlab-ci.yml b/container-publish.gitlab-ci.yml index d09f9af..96c45be 100644 --- a/container-publish.gitlab-ci.yml +++ b/container-publish.gitlab-ci.yml @@ -13,6 +13,7 @@ DOCKER_REGISTRY: $CI_REGISTRY_IMAGE DOCKER_REGISTRY_USER: $CI_REGISTRY_USER DOCKER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD + EXTRA_ARGS: "" .publish-image-jib-maven: image: $MAVEN_IMAGE @@ -25,7 +26,7 @@ if [ "${MVN_VERSION}" == "true" ]; then mvn versions:set -DnewVersion=$PARSED_VERSION -DgenerateBackupPoms=false fi - - mvn $MAVEN_CLI_OPTS compile jib:build + - mvn $MAVEN_CLI_OPTS compile jib:build $EXTRA_ARGS "-DskipTests" "-Djib.to.image=$DOCKER_REGISTRY:$PARSED_VERSION" "-Djib.to.auth.username=$DOCKER_REGISTRY_USER" @@ -36,10 +37,10 @@ <<: *container-publish-common variables: <<: *container-publish-common-variables - GRADLE_EXTRA_ARGS: "" + EXTRA_ARGS: $GRADLE_EXTRA_ARGS script: - echo $PARSED_VERSION - - ./gradlew assemble jib $GRADLE_EXTRA_ARGS + - ./gradlew assemble jib $EXTRA_ARGS "-DskipTests" "-Djib.to.image=$DOCKER_REGISTRY:$PARSED_VERSION"" "-Djib.to.auth.username=$DOCKER_REGISTRY_USER" @@ -58,4 +59,4 @@ script: - mkdir -p /kaniko/.docker - echo "{\"auths\":{\"$DOCKER_REGISTRY\":{\"username\":\"$DOCKER_REGISTRY_USER\",\"password\":\"$DOCKER_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - - /kaniko/executor --context $CONTEXT_LOCATION --dockerfile $DOCKERFILE_LOCATION --destination $CI_REGISTRY_IMAGE:$PARSED_VERSION --skip-tls-verify + - /kaniko/executor --context $CONTEXT_LOCATION --dockerfile $DOCKERFILE_LOCATION --destination $CI_REGISTRY_IMAGE:$PARSED_VERSION $EXTRA_ARGS --skip-tls-verify diff --git a/documentation/chapters/templates/container-publish.adoc b/documentation/chapters/templates/container-publish.adoc index def17fc..e0b5ced 100644 --- a/documentation/chapters/templates/container-publish.adoc +++ b/documentation/chapters/templates/container-publish.adoc @@ -16,6 +16,7 @@ Falls das Projekt aus mehreren Poms besteht, kann `before_script:` benutzt werde |DOCKER_REGISTRY | Definiert die Registry an zu dem das Image veröffentlicht werden soll | $CI_REGISTRY_IMAGE |DOCKER_REGISTRY_USER | Definiert den User der benutzt werden soll | $CI_REGISTRY_USER |DOCKER_REGISTRY_PASSWORD | Definiert das Passwort des Benutzers | $CI_REGISTRY_PASSWORD +|EXTRA_ARGS | Weitere Argumente die an an den jeweiligen Job gegeben werden sollen. | "" |=== .sonar-template