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

Merge branch 'feature/KASM-2193-turn-off-zoom-sandbox' into 'develop'

Browse Source 
KASM-2193 Add --no-sandbox to zoom to allow app startup (6th review)

Closes KASM-2193

See merge request kasm-technologies/internal/workspaces-images!33
This commit is contained in:
Justin Travis 2022-03-28 18:03:46 +00:00
commit 3d3a51a1e0
57 changed files with 52 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
.gitlab-ci.yml
View File

@ -34,7 +34,7 @@ build_browser_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
only:
@ -63,7 +63,7 @@ build_app_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
only:
@ -92,9 +92,9 @@ build_ubuntu_desktop_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; CORE_IMAGE=$CORE_IMAGE-private; else PRIVATE=""; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
only:
- develop
- /^release\/.*$/
@ -120,10 +120,13 @@ build_non_ubuntu:
# Ensure readme and description files are present
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Set base image based on kasm_image variable
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; else PRIVATE=""; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
only:
- develop
- /^release\/.*$/
@ -154,7 +157,7 @@ build_dev_browser_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
@ -183,7 +186,7 @@ build_dev_app_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
@ -212,11 +215,11 @@ build_dev_ubuntu_desktop_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; CORE_IMAGE=$CORE_IMAGE-private; else PRIVATE=""; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
except:
- develop
- /^release\/.*$/
@ -240,11 +243,15 @@ build_dev_non_ubuntu:
# Ensure readme and description files are present
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
- if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; else PRIVATE=""; fi;
# Set base image based on kasm_image variable
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG=$CORE_IMAGE_TAG -f dockerfile-kasm-$KASM_IMAGE .
except:
- develop
- /^release\/.*$/
@ -271,7 +278,7 @@ build_schedules_browser_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
@ -300,7 +307,7 @@ build_schedules_app_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
@ -329,11 +336,11 @@ build_schedules_ubuntu_desktop_images:
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; CORE_IMAGE=$CORE_IMAGE-private; else PRIVATE=""; fi;
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
only:
- schedules
tags:
@ -356,11 +363,15 @@ build_schedules_non_ubuntu:
# Ensure readme and description files are present
- ls docs/$KASM_IMAGE/README.md
- ls docs/$KASM_IMAGE/description.txt
- if [[ $USE_PRIVATE_IMAGES ]]; then PRIVATE=-private; else PRIVATE=""; fi;
# Set base image based on kasm_image variable
- if [[ $KASM_IMAGE =~ 'centos-7-desktop' ]]; then CORE_IMAGE=core-centos-7; fi
- if [[ $KASM_IMAGE =~ 'tracelabs' ]]; then CORE_IMAGE=core-kali-rolling; fi
# Check for private variable to build against private core images
- if [[ $USE_PRIVATE_IMAGES -eq 1 ]]; then CORE_IMAGE=$CORE_IMAGE-private; fi;
# Equivalent to docker build and docker push. Builds amd64 natively uses qemu for arm64.
# The only way to push multiple architectures to the same tag is to use buildx.
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg PRIVATE=$PRIVATE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
- docker buildx build --push --platform $BUILD_PLATFORM -t ${ORG_NAME}/$KASM_IMAGE:$SANITIZED_ROLLING_BRANCH -t ${ORG_NAME}/$KASM_IMAGE-private:$SANITIZED_ROLLING_BRANCH --build-arg BASE_IMAGE=$CORE_IMAGE --build-arg BASE_TAG="$SANITIZED_ROLLING_BRANCH" -f dockerfile-kasm-$KASM_IMAGE .
only:
- schedules
tags:
@ -386,4 +397,4 @@ update_readmes:
- $README_PASSWORD
parallel:
matrix:
- KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-bionic-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-bionic-dind, ubuntu-bionic-dind-rootless, tracelabs, java-dev ]
- KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-focal-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-focal-dind, ubuntu-focal-dind-rootless, tracelabs, java-dev ]

1
dockerfile-kasm-brave
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

4
dockerfile-kasm-centos-7-desktop
View File

@ -1,6 +1,6 @@
ARG BASE_TAG="develop"
ARG PRIVATE=""
FROM kasmweb/core-centos-7$PRIVATE:$BASE_TAG
ARG BASE_IMAGE="core-centos-7"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
ENV DISTRO=centos

1
dockerfile-kasm-chrome
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-chrome-flash
View File

@ -7,7 +7,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-chromium
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-desktop
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

4
dockerfile-kasm-desktop-deluxe
View File

@ -12,7 +12,6 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
# Add Kasm Branding
RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png
@ -96,9 +95,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

1
dockerfile-kasm-discord
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-doom
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-edge
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-firefox
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-firefox-flash
View File

@ -7,7 +7,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-firefox-mobile
View File

@ -12,7 +12,6 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
# Install Firefox
COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/

1
dockerfile-kasm-gimp
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-hunchly
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-insomnia
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

4
dockerfile-kasm-java-dev
View File

@ -12,7 +12,6 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
### Install Tools
@ -55,9 +54,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

1
dockerfile-kasm-maltego
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-only-office
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-postman
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-rdesktop
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

3
dockerfile-kasm-realvnc-vncviewer
View File

@ -1,5 +1,6 @@
ARG BASE_TAG="develop"
FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
ARG BASE_IMAGE="core-ubuntu-focal"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
ENV HOME /home/kasm-default-profile

1
dockerfile-kasm-remmina
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-signal
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-slack
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-steam
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-sublime-text
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-teams
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-telegram
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-terminal
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-tor-browser
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
# TODO: Once we satisfy KASM-1423, move these to the core images instead
ENV PULSE_RUNTIME_PATH "/tmp/pulse"
ENV PULSE_STATE_PATH "/tmp/pulse"

4
dockerfile-kasm-tracelabs
View File

@ -1,6 +1,6 @@
ARG BASE_TAG="develop"
ARG PRIVATE=""
FROM kasmweb/core-kali-rolling$PRIVATE:$BASE_TAG
ARG BASE_IMAGE="core-kali-rolling"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
ENV HOME /home/kasm-default-profile

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

@ -1,6 +1,6 @@
ARG BASE_TAG="develop"
ARG PRIVATE=""
FROM kasmweb/core-ubuntu-focal$PRIVATE:$BASE_TAG
ARG BASE_IMAGE="core-ubuntu-focal"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
@ -12,7 +12,6 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
### Install Tools
@ -92,9 +91,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

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

@ -1,12 +1,11 @@
ARG BASE_TAG="develop"
ARG PRIVATE=""
FROM kasmweb/core-ubuntu-focal$PRIVATE:$BASE_TAG
ARG BASE_IMAGE="core-ubuntu-focal"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########
@ -49,9 +48,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

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

@ -1,12 +1,11 @@
ARG BASE_TAG="develop"
ARG PRIVATE=""
FROM kasmweb/core-ubuntu-focal$PRIVATE:$BASE_TAG
ARG BASE_IMAGE="core-ubuntu-focal"
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########
@ -46,9 +45,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

1
dockerfile-kasm-vlc
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-vmware-horizon
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-vs-code
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-zoom
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

1
dockerfile-kasm-zsnes
View File

@ -6,7 +6,6 @@ USER root
ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install
ENV BASE_IMAGE $BASE_IMAGE
WORKDIR $HOME
######### Customize Container Here ###########

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

9
src/ubuntu/install/realvnc_vncviewer/custom_startup.sh
View File

@ -2,7 +2,8 @@
set -ex
START_COMMAND="/usr/bin/vncviewer"
PGREP="vncviewer"
MAXIMUS="false"
export MAXIMIZE="false"
MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
DEFAULT_ARGS=""
ARGS=${APP_ARGS:-$DEFAULT_ARGS}
@ -38,6 +39,7 @@ kasm_exec() {
if [ -n "$URL" ] ; then
/usr/bin/filter_ready
/usr/bin/desktop_ready
bash ${MAXIMIZE_SCRIPT} &
$START_COMMAND $ARGS $OPT_URL
else
echo "No URL specified for exec command. Doing nothing."
@ -53,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
@ -64,6 +62,7 @@ kasm_startup() {
/usr/bin/filter_ready
/usr/bin/desktop_ready
set +e
bash ${MAXIMIZE_SCRIPT} &
$START_COMMAND $ARGS $URL
set -e
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

2
src/ubuntu/install/zoom/custom_startup.sh
View File

@ -5,7 +5,7 @@ PGREP="zoom"
export MAXIMIZE="true"
export MAXIMIZE_NAME="Zoom"
MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
DEFAULT_ARGS=""
DEFAULT_ARGS="--no-sandbox"
ARGS=${APP_ARGS:-$DEFAULT_ARGS}
options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit

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