Resolve KASM-4120 "Feature/ fix VSCode wsl"

This commit is contained in:
Ryan Kuba 2023-03-22 12:39:09 +00:00 committed by Justin Travis
parent 16b37015a3
commit 27aedc965b
20 changed files with 25 additions and 30 deletions

View File

@ -13,6 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools

View File

@ -13,7 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/

View File

@ -12,7 +12,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/

View File

@ -12,6 +12,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
# Add Kasm Branding # Add Kasm Branding
RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png
@ -39,17 +40,14 @@ RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefo
COPY ./src/ubuntu/install/sublime_text $INST_SCRIPTS/sublime_text/ COPY ./src/ubuntu/install/sublime_text $INST_SCRIPTS/sublime_text/
RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/
### Install Visual Studio Code ### Install Visual Studio Code
COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/ COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/
RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/
### Install NextCloud ### Install NextCloud
COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/
RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/
### Install Remmina ### Install Remmina
COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/

View File

@ -13,7 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/

View File

@ -12,7 +12,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/

View File

@ -13,7 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/opensuse/install/tools $INST_SCRIPTS/tools/ COPY ./src/opensuse/install/tools $INST_SCRIPTS/tools/

View File

@ -13,7 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/

View File

@ -13,7 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/
@ -36,17 +36,14 @@ RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefo
COPY ./src/oracle/install/sublime_text $INST_SCRIPTS/sublime_text/ COPY ./src/oracle/install/sublime_text $INST_SCRIPTS/sublime_text/
RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/
### Install Visual Studio Code ### Install Visual Studio Code
COPY ./src/oracle/install/vs_code $INST_SCRIPTS/vs_code/ COPY ./src/oracle/install/vs_code $INST_SCRIPTS/vs_code/
RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/
### Install NextCloud ### Install NextCloud
COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/
RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/
### Install Remmina ### Install Remmina
COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/

View File

@ -13,7 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/

View File

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

View File

@ -10,7 +10,6 @@ WORKDIR $HOME
######### Customize Container Here ########### ######### Customize Container Here ###########
# Install Remnux Utils # Install Remnux Utils
COPY ./src/ubuntu/install/remnux $INST_SCRIPTS/remnux/ COPY ./src/ubuntu/install/remnux $INST_SCRIPTS/remnux/
RUN bash $INST_SCRIPTS/remnux/install_remnux.sh && rm -rf $INST_SCRIPTS/remnux/ RUN bash $INST_SCRIPTS/remnux/install_remnux.sh && rm -rf $INST_SCRIPTS/remnux/

View File

@ -13,7 +13,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/

View File

@ -12,7 +12,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/
@ -39,17 +39,14 @@ RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefo
COPY ./src/ubuntu/install/sublime_text $INST_SCRIPTS/sublime_text/ COPY ./src/ubuntu/install/sublime_text $INST_SCRIPTS/sublime_text/
RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/
### Install Visual Studio Code ### Install Visual Studio Code
COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/ COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/
RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/
### Install NextCloud ### Install NextCloud
COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/
RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/
### Install Remmina ### Install Remmina
COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/

View File

@ -13,7 +13,9 @@ WORKDIR $HOME
ENV DOCKER_CHANNEL=stable \ ENV DOCKER_CHANNEL=stable \
DOCKER_VERSION=20.10.9 \ DOCKER_VERSION=20.10.9 \
DOCKER_COMPOSE_VERSION=1.29.2 \ DOCKER_COMPOSE_VERSION=1.29.2 \
DEBUG=false DEBUG=false \
DONT_PROMPT_WSL_INSTALL="No_Prompt_please"
COPY ./src/ubuntu/install/dind $INST_SCRIPTS/dind/ COPY ./src/ubuntu/install/dind $INST_SCRIPTS/dind/
COPY ./src/ubuntu/install/dind/daemon.json /etc/docker/daemon.json COPY ./src/ubuntu/install/dind/daemon.json /etc/docker/daemon.json

View File

@ -11,7 +11,8 @@ WORKDIR $HOME
######### Customize Container Here ########### ######### Customize Container Here ###########
ENV DOCKER_BIN=/usr/local/lib/docker \ ENV DOCKER_BIN=/usr/local/lib/docker \
XDG_RUNTIME_DIR=/docker XDG_RUNTIME_DIR=/docker \
DONT_PROMPT_WSL_INSTALL="No_Prompt_please"
RUN mkdir -p $DOCKER_BIN && chown 1000:0 $DOCKER_BIN && \ RUN mkdir -p $DOCKER_BIN && chown 1000:0 $DOCKER_BIN && \
mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR

View File

@ -12,7 +12,7 @@ WORKDIR $HOME
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV KASM_RX_HOME $STARTUPDIR/kasmrx
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
### Install Tools ### Install Tools
COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/
@ -39,17 +39,14 @@ RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefo
COPY ./src/ubuntu/install/sublime_text $INST_SCRIPTS/sublime_text/ COPY ./src/ubuntu/install/sublime_text $INST_SCRIPTS/sublime_text/
RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/
### Install Visual Studio Code ### Install Visual Studio Code
COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/ COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/
RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/
### Install NextCloud ### Install NextCloud
COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/
RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/
### Install Remmina ### Install Remmina
COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/
RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/

View File

@ -13,7 +13,8 @@ WORKDIR $HOME
ENV DOCKER_CHANNEL=stable \ ENV DOCKER_CHANNEL=stable \
DOCKER_VERSION=20.10.9 \ DOCKER_VERSION=20.10.9 \
DOCKER_COMPOSE_VERSION=1.29.2 \ DOCKER_COMPOSE_VERSION=1.29.2 \
DEBUG=false DEBUG=false \
DONT_PROMPT_WSL_INSTALL="No_Prompt_please"
COPY ./src/ubuntu/install/dind $INST_SCRIPTS/dind/ COPY ./src/ubuntu/install/dind $INST_SCRIPTS/dind/
COPY ./src/ubuntu/install/dind/daemon.json /etc/docker/daemon.json COPY ./src/ubuntu/install/dind/daemon.json /etc/docker/daemon.json

View File

@ -11,7 +11,8 @@ WORKDIR $HOME
######### Customize Container Here ########### ######### Customize Container Here ###########
ENV DOCKER_BIN=/usr/local/lib/docker \ ENV DOCKER_BIN=/usr/local/lib/docker \
XDG_RUNTIME_DIR=/docker XDG_RUNTIME_DIR=/docker \
DONT_PROMPT_WSL_INSTALL="No_Prompt_please"
RUN mkdir -p $DOCKER_BIN && chown 1000:0 $DOCKER_BIN && \ RUN mkdir -p $DOCKER_BIN && chown 1000:0 $DOCKER_BIN && \
mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR

View File

@ -6,11 +6,11 @@ USER root
ENV HOME /home/kasm-default-profile ENV HOME /home/kasm-default-profile
ENV STARTUPDIR /dockerstartup ENV STARTUPDIR /dockerstartup
ENV INST_SCRIPTS $STARTUPDIR/install ENV INST_SCRIPTS $STARTUPDIR/install
ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please"
WORKDIR $HOME WORKDIR $HOME
######### Customize Container Here ########### ######### Customize Container Here ###########
COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/ COPY ./src/ubuntu/install/vs_code $INST_SCRIPTS/vs_code/
RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/ RUN bash $INST_SCRIPTS/vs_code/install_vs_code.sh && rm -rf $INST_SCRIPTS/vs_code/