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

KASM-2193 Remove Maximus usage from older Bionic images.

Browse Source
This commit is contained in:
Richard Koliser 2022-03-23 17:03:54 -04:00
parent 150be47572
commit cd129cd194
19 changed files with 5 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dockerfile-kasm-desktop-deluxe
View File

@ -96,9 +96,6 @@ RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/t
COPY ./src/ubuntu/install/telegram $INST_SCRIPTS/telegram/
RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/
### Remove maxmius
RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
#ADD ./src/common/scripts $STARTUPDIR
RUN $STARTUPDIR/set_user_permission.sh $HOME

3
dockerfile-kasm-java-dev
View File

@ -55,9 +55,6 @@ RUN apt-get update && apt-get install -y default-jdk default-jre
COPY ./src/ubuntu/install/eclipse $INST_SCRIPTS/eclipse
RUN bash $INST_SCRIPTS/eclipse/install_eclipse.sh && rm -rf $INST_SCRIPTS/eclipse/
### Remove maxmius
RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
#ADD ./src/common/scripts $STARTUPDIR
RUN $STARTUPDIR/set_user_permission.sh $HOME

3
dockerfile-kasm-ubuntu-focal-desktop
View File

@ -92,9 +92,6 @@ RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/t
COPY ./src/ubuntu/install/telegram $INST_SCRIPTS/telegram/
RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/
### Remove maxmius
RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
#ADD ./src/common/scripts $STARTUPDIR
RUN $STARTUPDIR/set_user_permission.sh $HOME

3
dockerfile-kasm-ubuntu-focal-dind
View File

@ -49,9 +49,6 @@ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_co
COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/
### Remove maxmius
RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
######### End Customizations ###########
RUN chown 1000:0 $HOME

3
dockerfile-kasm-ubuntu-focal-dind-rootless
View File

@ -46,9 +46,6 @@ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_co
COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/
RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/
### Remove maxmius
RUN if [[ ${BASE_IMAGE} =~ "bionic" ]]; then apt-get remove -y maximus; fi;
RUN chown 1000:0 $HOME
USER 1000

4
src/ubuntu/install/dind_rootless/custom_startup.sh
View File

@ -55,10 +55,6 @@ kasm_startup() {
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
if [[ $MAXIMUS == 'true' ]] ; then
maximus &
fi
while true
do
if ! pgrep -x $PGREP > /dev/null

5
src/ubuntu/install/discord/install_discord.sh
View File

@ -1,10 +1,7 @@
#!/usr/bin/env bash
set -ex
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
curl -L -o discord.deb "https://discord.com/api/download?platform=linux&format=deb"
apt-get install -y ./discord.deb
rm discord.deb

5
src/ubuntu/install/gimp/install_gimp.sh
View File

@ -1,10 +1,7 @@
#!/usr/bin/env bash
set -ex
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y gimp
cp /usr/share/applications/gimp.desktop $HOME/Desktop/
chmod +x $HOME/Desktop/gimp.desktop

6
src/ubuntu/install/insomnia/install_insomnia.sh
View File

@ -9,9 +9,3 @@ cp /usr/share/applications/insomnia.desktop $HOME/Desktop
chmod +x $HOME/Desktop/insomnia.desktop
chown 1000:1000 $HOME/Desktop/insomnia.desktop
rm insomnia.deb
# Conveniences for python development
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi

6
src/ubuntu/install/only_office/install_only_office.sh
View File

@ -17,9 +17,3 @@ sed -i 's/ONLYOFFICE Desktop Editors/ONLYOFFICE/g' $HOME/Desktop/onlyoffice-desk
chmod +x $HOME/Desktop/onlyoffice-desktopeditors.desktop
# KASM-1541
sed -i 's#/usr/bin/onlyoffice-desktopeditors %U$#bash -c "source ~/.bashrc \&\& /usr/bin/onlyoffice-desktopeditors %U"#' /usr/share/applications/onlyoffice-desktopeditors.desktop
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get update
apt-get install -y maximus
fi

6
src/ubuntu/install/postman/install_postman.sh
View File

@ -19,9 +19,3 @@ chmod +x /usr/share/applications/postman.desktop
cp /usr/share/applications/postman.desktop $HOME/Desktop/postman.desktop
chmod +x $HOME/Desktop/postman.desktop
chown 1000:1000 $HOME/Desktop/postman.desktop
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get update
apt-get install -y maximus
fi

5
src/ubuntu/install/signal/install_signal.sh
View File

@ -12,10 +12,7 @@ fi
wget -O- https://updates.signal.org/desktop/apt/keys.asc | apt-key add -
echo "deb [arch=${ARCH}] https://updates.signal.org/desktop/apt xenial main" | tee -a /etc/apt/sources.list.d/signal-xenial.list
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y signal-desktop
cp /usr/share/applications/signal-desktop.desktop $HOME/Desktop/
chmod +x $HOME/Desktop/signal-desktop.desktop

5
src/ubuntu/install/slack/install_slack.sh
View File

@ -22,10 +22,7 @@ version=4.12.2
# This path may not be accurate once arm64 support arrives. Specifically I don't know if it will still be under x64
wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-desktop-${version}-${ARCH}.deb
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y ./slack-desktop-${version}-${ARCH}.deb
rm slack-desktop-${version}-${ARCH}.deb
sed -i 's,/usr/bin/slack,/usr/bin/slack --no-sandbox,g' /usr/share/applications/slack.desktop

5
src/ubuntu/install/steam/install_steam.sh
View File

@ -2,10 +2,7 @@
set -ex
dpkg --add-architecture i386
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y steam-installer
cp /usr/share/applications/steam.desktop $HOME/Desktop/
chmod +x $HOME/Desktop/steam.desktop

4
src/ubuntu/install/sublime_text/install_sublime_text.sh
View File

@ -13,10 +13,6 @@ apt-get install -y apt-transport-https
echo "deb https://download.sublimetext.com/ apt/stable/" | tee /etc/apt/sources.list.d/sublime-text.list
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y sublime-text
cp /usr/share/applications/sublime_text.desktop $HOME/Desktop/

4
src/ubuntu/install/vlc/install_vlc.sh
View File

@ -1,8 +1,4 @@
#!/usr/bin/env bash
set -ex
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y vlc

5
src/ubuntu/install/vs_code/install_vs_code.sh
View File

@ -15,8 +15,3 @@ apt-get update
apt-get install -y python3-setuptools \
python3-venv \
python3-virtualenv
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi

4
src/ubuntu/install/zoom/install_zoom.sh
View File

@ -11,10 +11,6 @@ fi
wget -q https://zoom.us/client/latest/zoom_${ARCH}.deb
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y ./zoom_${ARCH}.deb
rm zoom_amd64.deb
cp /usr/share/applications/Zoom.desktop $HOME/Desktop/

4
src/ubuntu/install/zsnes/install_zsnes.sh
View File

@ -2,10 +2,6 @@
set -ex
dpkg --add-architecture i386
apt-get update
if [[ "$(lsb_release -cs)" == "bionic" ]];
then
apt-get install -y maximus
fi
apt-get install -y zsnes