Mirrors/kasm-workspaces-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-images.git synced 2026-01-23 02:25:24 +00:00
Code Issues Projects Releases Wiki Activity

QA-136 removing app layer function

Browse source
This commit is contained in:
Huan Truong 2025-08-07 14:37:11 -05:00
parent a9dace3d6d
commit 9722e8a4dd
No known key found for this signature in database
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ci-scripts/gitlab-ci.template
View file

@ -23,7 +23,6 @@ before_script:
- if [ "$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 $GHCR_USERNAME --password $GHCR_PASSWORD ghcr.io; fi
- export SANITIZED_BRANCH="$(echo $CI_COMMIT_REF_NAME | sed -r 's#^release/##' | sed 's/\//_/g')"
- export BASE_TAG="{{ BASE_TAG }}"
###############################################
# Build Containers and push to cache endpoint #
@ -172,7 +171,9 @@ manifest_{{ IMAGE.name }}:
script:
- apk add bash tar
- bash ci-scripts/manifest.sh "{{ IMAGE.name }}" "multi"{% if IMAGE.singleapp %}
- bash ci-scripts/app-layer.sh "{{ IMAGE.name }}" "multi" "{{ IMAGE.base }}"{% endif %}
# Disabling app layer build due to feature not being used
#{% if IMAGE.singleapp %}
#- bash ci-scripts/app-layer.sh "{{ IMAGE.name }}" "multi" "{{ IMAGE.base }}"{% endif %}
needs:
- test_{{ IMAGE.name }}
retry: 1
@ -204,7 +205,9 @@ manifest_{{ IMAGE.name }}:
script:
- apk add bash tar
- bash ci-scripts/manifest.sh "{{ IMAGE.name }}" "single"{% if IMAGE.singleapp %}
- bash ci-scripts/app-layer.sh "{{ IMAGE.name }}" "single" "{{ IMAGE.base }}"{% endif %}
# Disabling app layer build due to feature not being used
#{% if IMAGE.singleapp %}
#- bash ci-scripts/app-layer.sh "{{ IMAGE.name }}" "multi" "{{ IMAGE.base }}"{% endif %}
needs:
- test_{{ IMAGE.name }}
retry: 1
@ -232,7 +235,7 @@ weekly_manifest_{{ IMAGE.name }}:
- when: never
script:
- apk add bash tar
- bash ci-scripts/weekly-manifest.sh "{{ IMAGE.name }}" "multi" {% if IMAGE.singleapp %}"{{ IMAGE.base }}"{% endif %}
- bash ci-scripts/weekly-manifest.sh "{{ IMAGE.name }}" "multi"
retry: 1
tags:
- oci-amd-scheduled
@ -254,7 +257,7 @@ weekly_manifest_{{ IMAGE.name }}:
- when: never
script:
- apk add bash tar
- bash ci-scripts/weekly-manifest.sh "{{ IMAGE.name }}" "single" {% if IMAGE.singleapp %}"{{ IMAGE.base }}"{% endif %}
- bash ci-scripts/weekly-manifest.sh "{{ IMAGE.name }}" "single"
retry: 1
tags:
- oci-amd-scheduled

18
ci-scripts/weekly-manifest.sh
View file

@ -39,12 +39,13 @@ if [[ "${TYPE}" == "multi" ]]; then
done
# Single App Layer Images
if [ ! -z "${BASE}" ];then
tagImage "${ORG_NAME}/${APPS}:x86_64-${BASE}-${NAME}-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${APPS}:x86_64-${BASE}-${NAME}-${SANITIZED_BRANCH}"
tagImage "${ORG_NAME}/${APPS}:aarch64-${BASE}-${NAME}-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${APPS}:aarch64-${BASE}-${NAME}-${SANITIZED_BRANCH}"
# Disabling Single App Layer due to functionality not being used currently
# if [ ! -z "${BASE}" ];then
# tagImage "${ORG_NAME}/${APPS}:x86_64-${BASE}-${NAME}-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${APPS}:x86_64-${BASE}-${NAME}-${SANITIZED_BRANCH}"
# tagImage "${ORG_NAME}/${APPS}:aarch64-${BASE}-${NAME}-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${APPS}:aarch64-${BASE}-${NAME}-${SANITIZED_BRANCH}"
manifest "${ORG_NAME}/${APPS}:${BASE}-${NAME}-${SANITIZED_BRANCH}" "${ORG_NAME}/${APPS}" "${BASE}-${NAME}-${SANITIZED_BRANCH}"
fi
# manifest "${ORG_NAME}/${APPS}:${BASE}-${NAME}-${SANITIZED_BRANCH}" "${ORG_NAME}/${APPS}" "${BASE}-${NAME}-${SANITIZED_BRANCH}"
# fi
# Single arch image just pull and push
else
tagImage "${ORG_NAME}/${NAME}:x86_64-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${NAME}:${SANITIZED_BRANCH}"
@ -54,7 +55,8 @@ else
done
# Single App Layer Images
if [ ! -z "${BASE}" ];then
tagImage "${ORG_NAME}/${APPS}:${BASE}-${NAME}-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${APPS}:x86_64-${BASE}-${NAME}-${SANITIZED_BRANCH}"
fi
# Disabling Single App Layer due to functionality not being used currently
# if [ ! -z "${BASE}" ];then
# tagImage "${ORG_NAME}/${APPS}:${BASE}-${NAME}-${SANITIZED_BRANCH_DAILY}" "${ORG_NAME}/${APPS}:x86_64-${BASE}-${NAME}-${SANITIZED_BRANCH}"
# fi
fi