ci(gitlab-ci): use curl instead of wget again; more output for wait
This commit is contained in:
parent
7600862444
commit
4513634a0c
@ -86,8 +86,7 @@ setup:containers:frontend: &setup-container
|
|||||||
- IMAGE_TAG=${IMAGE_TYPE}/${CI_COMMIT_REF_SLUG}:${IMAGE_VERSION}
|
- IMAGE_TAG=${IMAGE_TYPE}/${CI_COMMIT_REF_SLUG}:${IMAGE_VERSION}
|
||||||
- REGISTRY_DESTINATION=${CI_REGISTRY_IMAGE}/${IMAGE_TYPE}/${CI_COMMIT_REF_SLUG}:${IMAGE_VERSION}
|
- REGISTRY_DESTINATION=${CI_REGISTRY_IMAGE}/${IMAGE_TYPE}/${CI_COMMIT_REF_SLUG}:${IMAGE_VERSION}
|
||||||
script:
|
script:
|
||||||
- yum install wget -y
|
- curl --request GET --header "PRIVATE-TOKEN:${REGISTRY_AUTH_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/registry/repositories?tags=true" > .gitlab-ci/.container-registry-contents.json
|
||||||
- wget --header "PRIVATE-TOKEN:${REGISTRY_AUTH_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/registry/repositories?tags=true" -o wget.log -O .gitlab-ci/.container-registry-contents.json
|
|
||||||
- IMAGE_EXISTS=`grep \""${REGISTRY_DESTINATION}"\" .gitlab-ci/.container-registry-contents.json || :`
|
- IMAGE_EXISTS=`grep \""${REGISTRY_DESTINATION}"\" .gitlab-ci/.container-registry-contents.json || :`
|
||||||
- test "${CI_JOB_MANUAL}" = true && echo "Force rebuilding container."
|
- test "${CI_JOB_MANUAL}" = true && echo "Force rebuilding container."
|
||||||
- >
|
- >
|
||||||
@ -114,6 +113,7 @@ setup:containers:frontend:wait: &setup-container-wait
|
|||||||
echo "Waiting for container ${IMAGE_TAG} to appear in the container registry..."
|
echo "Waiting for container ${IMAGE_TAG} to appear in the container registry..."
|
||||||
sleep 5
|
sleep 5
|
||||||
done
|
done
|
||||||
|
- echo "Image ${IMAGE_TAG} has been found in the container registry. Proceeding with the pipeline."
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_MERGE_REQUEST_ID
|
- if: $CI_MERGE_REQUEST_ID
|
||||||
when: always
|
when: always
|
||||||
|
|||||||
Reference in New Issue
Block a user