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

fix(container): remove --skip-tls-verify on image.tar build, rename CONTAINER_REGISTRY to CONTAINER_REGISTRY_IMAGE

Browse Source
This commit is contained in:
Karina 2022-04-01 14:11:41 +02:00 committed by Marcel Feix
parent 86ed4d3850
commit dd34b9884a
No known key found for this signature in database
GPG Key ID: 04D016E104A25F03
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,9 +8,10 @@ Needs a build container on the path `image.tar`. Use one of the Container build
.Variables .Variables
|=== |===
|Name |Description | Default Value |Name |Description | Default Value
| CONTAINER_REGISTRY | Url to the remote Registry | $CI_REGISTRY_IMAGE | CONTAINER_REGISTRY | The address of the Container Registry | $CI_REGISTRY
| CONTAINER_REGISTRY_IMAGE | The address of the project’s Container Registry. | $CI_REGISTRY_IMAGE
| CONTAINER_REGISTRY_USER | the user that should be used | $CI_REGISTRY_USER | CONTAINER_REGISTRY_USER | the user that should be used | $CI_REGISTRY_USER
| CONTAINER_REGISTRY_PASSWORD | the passwort for the remote registry | $CI_REGISTRY_PASSWORD | CONTAINER_REGISTRY_PASSWORD | the password for the remote registry | $CI_REGISTRY_PASSWORD
| EXTRA_PATH | Extra path that should be between the registry path and the image tag | "" | EXTRA_PATH | Extra path that should be between the registry path and the image tag | ""
| IMAGE_TAG | the Tag the image should be found on | Depends on the current path. Look at the rules of the Job. | IMAGE_TAG | the Tag the image should be found on | Depends on the current path. Look at the rules of the Job.
|=== |===

14
templates/container/container-build.gitlab-ci.yml
View File

@ -30,8 +30,14 @@
entrypoint: [ "" ] entrypoint: [ "" ]
variables: variables:
DOCKERFILE_LOCATION: $CI_PROJECT_DIR/Dockerfile DOCKERFILE_LOCATION: $CI_PROJECT_DIR/Dockerfile
REGISTRY_MIRROR: --registry-mirror nexus.corp.exxcellent.de:18000 --skip-tls-verify-registry nexus.corp.exxcellent.de:18000 --skip-tls-verify REGISTRY_MIRROR: --registry-mirror nexus.corp.exxcellent.de:18000 --skip-tls-verify-registry nexus.corp.exxcellent.de:18000
script: script:
- mkdir -p /kaniko/.docker - >-
- echo "{\"auths\":{\"$DOCKER_REGISTRY\":{\"username\":\"$DOCKER_REGISTRY_USER\",\"password\":\"$DOCKER_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json /kaniko/executor
- /kaniko/executor --context $CONTEXT_LOCATION --dockerfile $DOCKERFILE_LOCATION --no-push --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $EXTRA_ARGS $REGISTRY_MIRROR --tarPath image.tar --context $CONTEXT_LOCATION
--dockerfile $DOCKERFILE_LOCATION
--no-push
--destination $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
$EXTRA_ARGS
$REGISTRY_MIRROR
--tarPath image.tar

7
templates/container/container-publish.gitlab-ci.yml
View File

@ -4,7 +4,8 @@
name: quay.io/containers/skopeo:v1.5.2 name: quay.io/containers/skopeo:v1.5.2
entrypoint: [ "" ] entrypoint: [ "" ]
variables: variables:
CONTAINER_REGISTRY: $CI_REGISTRY_IMAGE CONTAINER_REGISTRY: $CI_REGISTRY
CONTAINER_REGISTRY_IMAGE: $CI_REGISTRY_IMAGE
CONTAINER_REGISTRY_USER: $CI_REGISTRY_USER CONTAINER_REGISTRY_USER: $CI_REGISTRY_USER
CONTAINER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD CONTAINER_REGISTRY_PASSWORD: $CI_REGISTRY_PASSWORD
EXTRA_PATH: "" EXTRA_PATH: ""
@ -22,7 +23,7 @@
EXTRA_PATH: "/feat/$CI_COMMIT_REF_NAME" EXTRA_PATH: "/feat/$CI_COMMIT_REF_NAME"
- when: never - when: never
script: script:
- skopeo login --username $CONTAINER_REGISTRY_USER --password $CONTAINER_REGISTRY_PASSWORD $CONTAINER_REGISTRY --tls-verify=false - skopeo login --username $CONTAINER_REGISTRY_USER --password $CONTAINER_REGISTRY_PASSWORD $CONTAINER_REGISTRY_IMAGE --tls-verify=false
- skopeo copy "docker-archive:image.tar" "docker://${CONTAINER_REGISTRY}${EXTRA_PATH}:${IMAGE_TAG}" --dest-tls-verify=false - skopeo copy "docker-archive:image.tar" "docker://${CONTAINER_REGISTRY_IMAGE}${EXTRA_PATH}:${IMAGE_TAG}" --dest-tls-verify=false
#TODO wir müssen noch den aktuell Tag bekommen damit wir den setzen können. (in default oder feat ausgeführt wird) #TODO wir müssen noch den aktuell Tag bekommen damit wir den setzen können. (in default oder feat ausgeführt wird)