mirror of
https://github.com/kasmtech/workspaces-core-images.git
synced 2024-11-07 08:04:06 +01:00
Merge branch 'bugfix/KASM_6388_KASM_6390' into 'develop'
KASM-6388 KASM-6390 See merge request kasm-technologies/internal/workspaces-core-images!220
This commit is contained in:
commit
df90126f21
@ -42,23 +42,6 @@ multiImages:
|
||||
- src/ubuntu/virtualgl/**
|
||||
- src/ubuntu/install/kde/**
|
||||
- kasm-desktop-kde/**
|
||||
- name1: ubuntu
|
||||
name2: bionic
|
||||
base: ubuntu:18.04
|
||||
bg: bg_bionic.png
|
||||
distro: ubuntu
|
||||
dockerfile: dockerfile-kasm-core
|
||||
changeFiles:
|
||||
- dockerfile-kasm-core
|
||||
- src/ubuntu/xfce/**
|
||||
- src/ubuntu/xfce/.config/**
|
||||
- src/ubuntu/xfce/.config/xfce4/**
|
||||
- src/ubuntu/xfce/.config/xfce4/xfconf/**
|
||||
- src/ubuntu/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/**
|
||||
- src/ubuntu/xfce/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/**
|
||||
- src/ubuntu/nvidia/**
|
||||
- src/ubuntu/sysbox/**
|
||||
- src/ubuntu/virtualgl/**
|
||||
- name1: ubuntu
|
||||
name2: focal
|
||||
base: ubuntu:20.04
|
||||
@ -268,34 +251,6 @@ multiImages:
|
||||
- src/opensuse/xfce/.config/xfce4/xfconf/**
|
||||
- src/opensuse/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/**
|
||||
- src/ubuntu/sysbox/**
|
||||
- name1: fedora
|
||||
name2: 37
|
||||
base: fedora:37
|
||||
bg: bg_fedora.png
|
||||
distro: fedora37
|
||||
dockerfile: dockerfile-kasm-core-fedora
|
||||
changeFiles:
|
||||
- dockerfile-kasm-core-fedora
|
||||
- src/fedora37/**
|
||||
- src/fedora37/xfce/**
|
||||
- src/fedora37/xfce/.config/**
|
||||
- src/fedora37/xfce/.config/xfce4/**
|
||||
- src/fedora37/xfce/.config/xfce4/xfconf/**
|
||||
- src/fedora37/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/**
|
||||
- name1: fedora
|
||||
name2: 38
|
||||
base: fedora:38
|
||||
bg: bg_fedora.png
|
||||
distro: fedora38
|
||||
dockerfile: dockerfile-kasm-core-fedora
|
||||
changeFiles:
|
||||
- dockerfile-kasm-core-fedora
|
||||
- src/fedora38/**
|
||||
- src/fedora38/xfce/**
|
||||
- src/fedora38/xfce/.config/**
|
||||
- src/fedora38/xfce/.config/xfce4/**
|
||||
- src/fedora38/xfce/.config/xfce4/xfconf/**
|
||||
- src/fedora38/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/**
|
||||
- name1: fedora
|
||||
name2: 39
|
||||
base: fedora:39
|
||||
@ -411,31 +366,3 @@ singleImages:
|
||||
- src/ubuntu/nvidia/**
|
||||
- src/ubuntu/sysbox/**
|
||||
- src/ubuntu/virtualgl/**
|
||||
- name1: centos
|
||||
name2: 7
|
||||
base: centos:centos7
|
||||
bg: bg_centos.png
|
||||
distro: centos
|
||||
dockerfile: dockerfile-kasm-core-centos
|
||||
changeFiles:
|
||||
- dockerfile-kasm-core-centos
|
||||
- src/centos/**
|
||||
- src/centos/xfce/**
|
||||
- src/centos/xfce/.config/**
|
||||
- src/centos/xfce/.config/xfce4/**
|
||||
- src/centos/xfce/.config/xfce4/xfconf/**
|
||||
- src/centos/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/**
|
||||
- name1: oracle
|
||||
name2: 7
|
||||
base: oraclelinux:7
|
||||
bg: bg_oracle.png
|
||||
distro: oracle7
|
||||
dockerfile: dockerfile-kasm-core-oracle
|
||||
changeFiles:
|
||||
- dockerfile-kasm-core-oracle
|
||||
- src/oracle7/**
|
||||
- src/oracle7/xfce/**
|
||||
- src/oracle7/xfce/.config/**
|
||||
- src/oracle7/xfce/.config/xfce4/**
|
||||
- src/oracle7/xfce/.config/xfce4/xfconf/**
|
||||
- src/oracle7/xfce/.config/xfce4/xfconf/xfce-perchannel-xml/**
|
||||
|
@ -3,11 +3,15 @@ set -ex
|
||||
|
||||
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
|
||||
if [[ "${ARCH}" == "arm64" ]]; then
|
||||
LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_arm64.deb"
|
||||
RPMLIBSSL="https://ap.edge.kernel.org/fedora/releases/39/Everything/aarch64/os/Packages/o/openssl1.1-1.1.1q-5.fc39.aarch64.rpm"
|
||||
LIBSSLDEB=$(curl -sL http://ports.ubuntu.com/pool/main/o/openssl/ | awk -F'(href="|">)' '/libssl1.1.*ubuntu2.[0-9][0-9]_arm64.deb/ {print $4}')
|
||||
LIBSSLRPM=$(curl -sL https://ap.edge.kernel.org/fedora/releases/39/Everything/aarch64/os/Packages/o/ | awk -F'(href="|">)' '/openssl1.1-1/ {print $2}')
|
||||
LIBSSLURL="http://ports.ubuntu.com/pool/main/o/openssl/${LIBSSLDEB}"
|
||||
RPMLIBSSL="https://ap.edge.kernel.org/fedora/releases/39/Everything/aarch64/os/Packages/o/${LIBSSLRPM}"
|
||||
else
|
||||
LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb"
|
||||
RPMLIBSSL="https://ap.edge.kernel.org/fedora/releases/39/Everything/x86_64/os/Packages/o/openssl1.1-1.1.1q-5.fc39.x86_64.rpm"
|
||||
LIBSSLDEB=$(curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/ | awk -F'(href="|">)' '/libssl1.1.*ubuntu2.[0-9][0-9]_amd64.deb/ {print $4}')
|
||||
LIBSSLRPM=$(curl -sL https://ap.edge.kernel.org/fedora/releases/39/Everything/x86_64/os/Packages/o/ | awk -F'(href="|">)' '/openssl1.1-1.*x86_64/ {print $2}')
|
||||
LIBSSLURL="http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/${LIBSSLDEB}"
|
||||
RPMLIBSSL="https://ap.edge.kernel.org/fedora/releases/39/Everything/x86_64/os/Packages/o/${LIBSSLRPM}"
|
||||
fi
|
||||
|
||||
# intall squid
|
||||
|
Loading…
Reference in New Issue
Block a user