@@ -22,34 +22,37 @@ start_container() {
2222
2323 # Try logging into the Gitlab Registry if credentials are provided
2424 # https://docs.gitlab.com/ee/user/packages/container_registry/index.html#authenticate-by-using-gitlab-cicd
25- if ! podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " --get-login " $CUSTOM_ENV_CI_REGISTRY " 2> /dev/null && \
26- [[ -n " $CUSTOM_ENV_CI_DEPLOY_USER " && -n " $CUSTOM_ENV_CI_DEPLOY_PASSWORD " ]]
25+ if [[ -n " $CUSTOM_ENV_CI_REGISTRY " ]]
2726 then
28- echo " Login to ${CUSTOM_ENV_CI_REGISTRY} with CI_DEPLOY_USER"
29- podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " \
30- --username " $CUSTOM_ENV_CI_DEPLOY_USER " \
31- --password " $CUSTOM_ENV_CI_DEPLOY_PASSWORD " \
32- " $CUSTOM_ENV_CI_REGISTRY "
33- fi
27+ if ! podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " --get-login " $CUSTOM_ENV_CI_REGISTRY " 2> /dev/null && \
28+ [[ -n " $CUSTOM_ENV_CI_DEPLOY_USER " && -n " $CUSTOM_ENV_CI_DEPLOY_PASSWORD " ]]
29+ then
30+ echo " Login to ${CUSTOM_ENV_CI_REGISTRY} with CI_DEPLOY_USER"
31+ podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " \
32+ --username " $CUSTOM_ENV_CI_DEPLOY_USER " \
33+ --password " $CUSTOM_ENV_CI_DEPLOY_PASSWORD " \
34+ " $CUSTOM_ENV_CI_REGISTRY "
35+ fi
3436
35- if ! podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " --get-login " $CUSTOM_ENV_CI_REGISTRY " 2> /dev/null && \
36- [[ -n " $CUSTOM_ENV_CI_JOB_USER " && -n " $CUSTOM_ENV_CI_JOB_TOKEN " ]]
37- then
38- echo " Login to ${CUSTOM_ENV_CI_REGISTRY} with CI_JOB_USER"
39- podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " \
40- --username " $CUSTOM_ENV_CI_JOB_USER " \
41- --password " $CUSTOM_ENV_CI_JOB_TOKEN " \
42- " $CUSTOM_ENV_CI_REGISTRY "
43- fi
37+ if ! podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " --get-login " $CUSTOM_ENV_CI_REGISTRY " 2> /dev/null && \
38+ [[ -n " $CUSTOM_ENV_CI_JOB_USER " && -n " $CUSTOM_ENV_CI_JOB_TOKEN " ]]
39+ then
40+ echo " Login to ${CUSTOM_ENV_CI_REGISTRY} with CI_JOB_USER"
41+ podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " \
42+ --username " $CUSTOM_ENV_CI_JOB_USER " \
43+ --password " $CUSTOM_ENV_CI_JOB_TOKEN " \
44+ " $CUSTOM_ENV_CI_REGISTRY "
45+ fi
4446
45- if ! podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " --get-login " $CUSTOM_ENV_CI_REGISTRY " 2> /dev/null && \
46- [[ -n " $CUSTOM_ENV_CI_REGISTRY_USER " && -n " $CUSTOM_ENV_CI_REGISTRY_PASSWORD " ]]
47- then
48- echo " Login to ${CUSTOM_ENV_CI_REGISTRY} with CI_REGISTRY_USER"
49- podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " \
50- --username " $CUSTOM_ENV_CI_REGISTRY_USER " \
51- --password " $CUSTOM_ENV_CI_REGISTRY_PASSWORD " \
52- " $CUSTOM_ENV_CI_REGISTRY "
47+ if ! podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " --get-login " $CUSTOM_ENV_CI_REGISTRY " 2> /dev/null && \
48+ [[ -n " $CUSTOM_ENV_CI_REGISTRY_USER " && -n " $CUSTOM_ENV_CI_REGISTRY_PASSWORD " ]]
49+ then
50+ echo " Login to ${CUSTOM_ENV_CI_REGISTRY} with CI_REGISTRY_USER"
51+ podman login --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " \
52+ --username " $CUSTOM_ENV_CI_REGISTRY_USER " \
53+ --password " $CUSTOM_ENV_CI_REGISTRY_PASSWORD " \
54+ " $CUSTOM_ENV_CI_REGISTRY "
55+ fi
5356 fi
5457
5558 podman pull --authfile " $CACHE_DIR " /_authfile_" $CONTAINER_ID " " $IMAGE "
0 commit comments