Merge branch 'bugfix/KASM-4765-fix-opensuse-datetime-dependency' into 'develop'

Resolve KASM-4765 "Bugfix/ fix opensuse datetime dependency"

Closes KASM-4765

See merge request kasm-technologies/internal/workspaces-core-images!134
This commit is contained in:
Matthew McClaskey 2023-08-03 19:54:56 +00:00
commit 836ff7a9f9

View File

@ -17,7 +17,7 @@ echo "Install KasmVNC server"
cd /tmp cd /tmp
BUILD_ARCH=$(uname -p) BUILD_ARCH=$(uname -p)
UBUNTU_CODENAME="" UBUNTU_CODENAME=""
COMMIT_ID="9450157af1e16f9a27c12170ac0ebfd28ee50ebc" COMMIT_ID="fa884809145e0ba6e5e1da49887a82b5cab0a1d1"
BRANCH="master" # just use 'release' for a release branch BRANCH="master" # just use 'release' for a release branch
KASMVNC_VER="1.1.1" KASMVNC_VER="1.1.1"
COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6) COMMIT_ID_SHORT=$(echo "${COMMIT_ID}" | cut -c1-6)
@ -59,7 +59,7 @@ elif [[ "${DISTRO}" == "opensuse" ]] ; then
fi fi
elif [[ "${DISTRO}" == "fedora37" ]] ; then elif [[ "${DISTRO}" == "fedora37" ]] ; then
if [[ "$(arch)" =~ ^x86_64$ ]] ; then if [[ "$(arch)" =~ ^x86_64$ ]] ; then
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_x86_64.rpm" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_x86_64.rpm"
else else
BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_aarch64.rpm" BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/${COMMIT_ID}/kasmvncserver_fedora_thirtyseven_${KASM_VER_NAME_PART}_aarch64.rpm"
fi fi
@ -152,6 +152,8 @@ elif [[ "${DISTRO}" == "alpine" ]] ; then
perl-switch \ perl-switch \
perl-try-tiny \ perl-try-tiny \
perl-yaml-tiny \ perl-yaml-tiny \
perl-datetime \
perl-datetime-timezone \
pixman \ pixman \
py3-xdg \ py3-xdg \
python3 \ python3 \