extern/workspaces-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-images.git synced 2025-06-21 01:58:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/KASM-6955_mirror_to_quay_github_hotfix_conditional' into 'develop'

Browse Source 
KASM-6955 Fix registry login conditional

Closes KASM-6955

See merge request kasm-technologies/internal/workspaces-images!261
This commit is contained in:
Richard Koliser 2025-03-31 21:08:43 +00:00
commit 876ebf81c6
2 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.gitlab-ci.yml
View File

@ -34,12 +34,39 @@ pipeline:
stage: run stage: run
except: except:
variables: variables:
- $README_USERNAME_RUN
- $README_PASSWORD_RUN
- $QUAY_API_KEY_RUN
- $DOCKERHUB_REVERT_RUN - $DOCKERHUB_REVERT_RUN
- $REVERT_IS_ROLLING_RUN - $REVERT_IS_ROLLING_RUN
trigger: trigger:
include: include:
- artifact: gitlab-ci.yml - artifact: gitlab-ci.yml
job: template job: template
pipeline_readme:
stage: run
only:
variables:
- $README_USERNAME_RUN
- $README_PASSWORD_RUN
variables:
README_USERNAME: $README_USERNAME_RUN
README_PASSWORD: $README_PASSWORD_RUN
trigger:
include:
- artifact: gitlab-ci.yml
job: template
pipeline_readme_quay:
stage: run
only:
variables:
- $QUAY_API_KEY_RUN
variables:
QUAY_API_KEY: $QUAY_API_KEY_RUN
trigger:
include:
- artifact: gitlab-ci.yml
job: template
pipeline_revert: pipeline_revert:
stage: run stage: run
only: only:

62
ci-scripts/gitlab-ci.template
View File

@ -20,8 +20,8 @@ variables:
MIRROR_ORG_NAME: "{{ MIRROR_ORG_NAME }}" MIRROR_ORG_NAME: "{{ MIRROR_ORG_NAME }}"
before_script: before_script:
- docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
- if [ -f "$CI_COMMIT_REF_PROTECTED" == "true" ]; then docker login --username $QUAY_USERNAME --password $QUAY_PASSWORD quay.io; fi - if [ "$CI_COMMIT_REF_PROTECTED" == "true" ]; then docker login --username $QUAY_USERNAME --password $QUAY_PASSWORD quay.io; fi
- if [ -f "$CI_COMMIT_REF_PROTECTED" == "true" ]; then docker login --username $GHCR_USERNAME --password $GHCR_PASSWORD ghcr.io; fi - if [ "$CI_COMMIT_REF_PROTECTED" == "true" ]; then docker login --username $GHCR_USERNAME --password $GHCR_PASSWORD ghcr.io; fi
- export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')" - export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')"
- export BASE_TAG="{{ BASE_TAG }}" - export BASE_TAG="{{ BASE_TAG }}"
@ -41,9 +41,9 @@ build_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
tags: tags:
@ -67,9 +67,9 @@ build_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
tags: tags:
@ -94,9 +94,9 @@ test_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -124,9 +124,9 @@ test_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -158,9 +158,9 @@ manifest_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -188,9 +188,9 @@ manifest_{{ IMAGE.name }}:
{% endfor %}{% endif %} {% endfor %}{% endif %}
except: except:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
- $DOCKERHUB_REVERT - $DOCKERHUB_REVERT
- $REVERT_IS_ROLLING - $REVERT_IS_ROLLING
needs: needs:
@ -213,11 +213,8 @@ update_readmes_{{ IMAGE.name }}:
- bash ci-scripts/readme.sh "{{ IMAGE.name }}" - bash ci-scripts/readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
variables:
README_USERNAME: $README_USERNAME_RUN
README_PASSWORD: $README_PASSWORD_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}
@ -230,11 +227,8 @@ update_readmes_{{ IMAGE.name }}:
- bash ci-scripts/readme.sh "{{ IMAGE.name }}" - bash ci-scripts/readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $README_USERNAME_RUN - $README_USERNAME
- $README_PASSWORD_RUN - $README_PASSWORD
variables:
README_USERNAME: $README_USERNAME_RUN
README_PASSWORD: $README_PASSWORD_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}
@ -248,9 +242,7 @@ update_quay_readmes_{{ IMAGE.name }}:
- bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}" - bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
variables:
QUAY_API_KEY: $QUAY_API_KEY_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}
@ -263,9 +255,7 @@ update_quay_readmes_{{ IMAGE.name }}:
- bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}" - bash ci-scripts/quay_readme.sh "{{ IMAGE.name }}"
only: only:
variables: variables:
- $QUAY_API_KEY_RUN - $QUAY_API_KEY
variables:
QUAY_API_KEY: $QUAY_API_KEY_RUN
tags: tags:
- oci-fixed-amd - oci-fixed-amd
{% endfor %} {% endfor %}