extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-25 00:43:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/KASM-5423-named-schedules' into 'develop'

Browse Source 
Resolve KASM-5423 "Feature/ named schedules"

Closes KASM-5423

See merge request kasm-technologies/internal/workspaces-core-images!178
This commit is contained in:
Justin Travis 2024-02-06 18:15:08 +00:00
commit d38104e657
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,7 +189,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
when: always when: always
variables: variables:
SCHEDULED: "{{ SCHEDULED }}" SCHEDULED: "{{ SCHEDULED }}"
SCHEDULE_NAME: "{{ SCHEDULED_NAME }}" SCHEDULE_NAME: "{{ SCHEDULE_NAME }}"
script: script:
- apk add bash - apk add bash
- bash ci-scripts/manifest.sh "{{ IMAGE.name1 }}" "{{ IMAGE.name2 }}" "multi" - bash ci-scripts/manifest.sh "{{ IMAGE.name1 }}" "{{ IMAGE.name2 }}" "multi"
@ -217,7 +217,7 @@ manifest_{{ IMAGE.name1 }}_{{ IMAGE.name2 }}:
when: always when: always
variables: variables:
SCHEDULED: "{{ SCHEDULED }}" SCHEDULED: "{{ SCHEDULED }}"
SCHEDULE_NAME: "{{ SCHEDULED_NAME }}" SCHEDULE_NAME: "{{ SCHEDULE_NAME }}"
script: script:
- apk add bash - apk add bash
- bash ci-scripts/manifest.sh "{{ IMAGE.name1 }}" "{{ IMAGE.name2 }}" "single" - bash ci-scripts/manifest.sh "{{ IMAGE.name1 }}" "{{ IMAGE.name2 }}" "single"

2
ci-scripts/manifest.sh
View File

@ -21,7 +21,7 @@ fi
# Determine if this is a rolling build # Determine if this is a rolling build
if [[ "${SCHEDULED}" != "NO" ]]; then if [[ "${SCHEDULED}" != "NO" ]]; then
if [[ "${SCHEDULE_NAME}" == "NO" ]]; then if [[ "${SCHEDULE_NAME}" == "NO" ]]; then
SANITIZED_BRANCH=${SANITIZED_BRANCH}-rolling SANITIZED_BRANCH=${SANITIZED_BRANCH}-rolling
else else
SANITIZED_BRANCH=${SANITIZED_BRANCH}-rolling-${SCHEDULE_NAME} SANITIZED_BRANCH=${SANITIZED_BRANCH}-rolling-${SCHEDULE_NAME}

4
src/ubuntu/install/squid/install/install_squid.sh
View File

@ -3,9 +3,9 @@ set -ex
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
if [[ "${ARCH}" == "arm64" ]]; then if [[ "${ARCH}" == "arm64" ]]; then
LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_arm64.deb" LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_arm64.deb"
else else
LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.20_amd64.deb" LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.21_amd64.deb"
fi fi
# intall squid # intall squid

2
src/ubuntu/install/xfce/install_xfce_ui.sh
View File

@ -153,6 +153,8 @@ elif [ "$DISTRO" = "opensuse" ]; then
xfce4-notifyd \ xfce4-notifyd \
xfce4-terminal \ xfce4-terminal \
xset xset
# Pidof is no longer shipped in OpenSuse
ln -s /usr/bin/pgrep /usr/bin/pidof
elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39) ]]; then elif [[ "$DISTRO" = @(fedora37|fedora38|fedora39) ]]; then
dnf group install xfce -y dnf group install xfce -y
dnf install -y \ dnf install -y \