paul/gilde-ci-cd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'chore(Container_Publis)_#190_ExtraArgs' into 'master'

Browse Source 
chore(Container Publish): #190 Add Extra Args for all Container Publishing

See merge request gilden/ci/gitlab-ci-templates!37
This commit is contained in:
Wolfram Gulde 2021-12-07 13:07:37 +00:00
commit ba6004ac0b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
container-publish.gitlab-ci.yml
View File

@ -13,6 +13,7 @@
DOCKER_REGISTRY: $CI_REGISTRY_IMAGE DOCKER_REGISTRY: $CI_REGISTRY_IMAGE
DOCKER_REGISTRY_USER: $CI_REGISTRY_USER DOCKER_REGISTRY_USER: $CI_REGISTRY_USER
DOCKER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD DOCKER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD
EXTRA_ARGS: ""
.publish-image-jib-maven: .publish-image-jib-maven:
image: $MAVEN_IMAGE image: $MAVEN_IMAGE
@ -25,7 +26,7 @@
if [ "${MVN_VERSION}" == "true" ]; then if [ "${MVN_VERSION}" == "true" ]; then
mvn versions:set -DnewVersion=$PARSED_VERSION -DgenerateBackupPoms=false mvn versions:set -DnewVersion=$PARSED_VERSION -DgenerateBackupPoms=false
fi fi
- mvn $MAVEN_CLI_OPTS compile jib:build - mvn $MAVEN_CLI_OPTS compile jib:build $EXTRA_ARGS
"-DskipTests" "-DskipTests"
"-Djib.to.image=$DOCKER_REGISTRY:$PARSED_VERSION" "-Djib.to.image=$DOCKER_REGISTRY:$PARSED_VERSION"
"-Djib.to.auth.username=$DOCKER_REGISTRY_USER" "-Djib.to.auth.username=$DOCKER_REGISTRY_USER"
@ -36,10 +37,10 @@
<<: *container-publish-common <<: *container-publish-common
variables: variables:
<<: *container-publish-common-variables <<: *container-publish-common-variables
GRADLE_EXTRA_ARGS: "" EXTRA_ARGS: $GRADLE_EXTRA_ARGS
script: script:
- echo $PARSED_VERSION - echo $PARSED_VERSION
- ./gradlew assemble jib $GRADLE_EXTRA_ARGS - ./gradlew assemble jib $EXTRA_ARGS
"-DskipTests" "-DskipTests"
"-Djib.to.image=$DOCKER_REGISTRY:$PARSED_VERSION"" "-Djib.to.image=$DOCKER_REGISTRY:$PARSED_VERSION""
"-Djib.to.auth.username=$DOCKER_REGISTRY_USER" "-Djib.to.auth.username=$DOCKER_REGISTRY_USER"
@ -58,4 +59,4 @@
script: script:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$DOCKER_REGISTRY\":{\"username\":\"$DOCKER_REGISTRY_USER\",\"password\":\"$DOCKER_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - 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

1
documentation/chapters/templates/container-publish.adoc
View File

@ -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 | 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_USER | Definiert den User der benutzt werden soll | $CI_REGISTRY_USER
|DOCKER_REGISTRY_PASSWORD | Definiert das Passwort des Benutzers | $CI_REGISTRY_PASSWORD |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 .sonar-template