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

fix(Container publishing): Revert back to Container Registry not Registry image

Browse Source
This commit is contained in:
Marcel Feix 2022-06-10 09:46:47 +02:00
parent adfbf9e353
commit 7bdeb9ba23
No known key found for this signature in database
GPG Key ID: 04D016E104A25F03
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +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_IMAGE | The address of the project’s Container Registry. | $CI_REGISTRY_IMAGE | CONTAINER_REGISTRY | The address of the project’s Container Registry. | $CI_REGISTRY
| 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 password 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. Has to start with a "/" | ""
| 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.
|=== |===

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

@ -4,7 +4,7 @@
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_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: ""
@ -23,4 +23,4 @@
- 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 --tls-verify=false
- skopeo copy "docker-archive:image.tar" "docker://${CONTAINER_REGISTRY}${EXTRA_PATH}:${IMAGE_TAG}" $EXTRA_ARGS --dest-tls-verify=false - skopeo copy "docker-archive:image.tar" "docker://${CONTAINER_REGISTRY}${EXTRA_PATH}:${IMAGE_TAG}" $EXTRA_ARGS --dest-tls-verify=false