From 27aedc965b0fc5698d0b2cfae889f88f91bf1808 Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Wed, 22 Mar 2023 12:39:09 +0000 Subject: [PATCH] Resolve KASM-4120 "Feature/ fix VSCode wsl" --- dockerfile-kasm-almalinux-8-desktop | 1 + dockerfile-kasm-almalinux-9-desktop | 2 +- dockerfile-kasm-debian-bullseye-desktop | 2 +- dockerfile-kasm-desktop-deluxe | 4 +--- dockerfile-kasm-fedora-37-desktop | 2 +- dockerfile-kasm-java-dev | 2 +- dockerfile-kasm-opensuse-15-desktop | 2 +- dockerfile-kasm-oracle-7-desktop | 2 +- dockerfile-kasm-oracle-8-desktop | 5 +---- dockerfile-kasm-oracle-9-desktop | 2 +- dockerfile-kasm-parrotos-5-desktop | 1 + dockerfile-kasm-remnux-focal-desktop | 1 - dockerfile-kasm-rockylinux-9-desktop | 2 +- dockerfile-kasm-ubuntu-focal-desktop | 5 +---- dockerfile-kasm-ubuntu-focal-dind | 4 +++- dockerfile-kasm-ubuntu-focal-dind-rootless | 5 +++-- dockerfile-kasm-ubuntu-jammy-desktop | 5 +---- dockerfile-kasm-ubuntu-jammy-dind | 3 ++- dockerfile-kasm-ubuntu-jammy-dind-rootless | 3 ++- dockerfile-kasm-vs-code | 2 +- 20 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dockerfile-kasm-almalinux-8-desktop b/dockerfile-kasm-almalinux-8-desktop index 6c26e4d..53e38ad 100644 --- a/dockerfile-kasm-almalinux-8-desktop +++ b/dockerfile-kasm-almalinux-8-desktop @@ -13,6 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools diff --git a/dockerfile-kasm-almalinux-9-desktop b/dockerfile-kasm-almalinux-9-desktop index a50e0c9..ae6d14d 100644 --- a/dockerfile-kasm-almalinux-9-desktop +++ b/dockerfile-kasm-almalinux-9-desktop @@ -13,7 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-debian-bullseye-desktop b/dockerfile-kasm-debian-bullseye-desktop index 64cffc3..f8ab66a 100644 --- a/dockerfile-kasm-debian-bullseye-desktop +++ b/dockerfile-kasm-debian-bullseye-desktop @@ -12,7 +12,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-desktop-deluxe b/dockerfile-kasm-desktop-deluxe index 02cebe0..2102f58 100644 --- a/dockerfile-kasm-desktop-deluxe +++ b/dockerfile-kasm-desktop-deluxe @@ -12,6 +12,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" # Add Kasm Branding 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/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ - ### Install Visual Studio 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/ - ### Install NextCloud COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ - ### Install Remmina COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ diff --git a/dockerfile-kasm-fedora-37-desktop b/dockerfile-kasm-fedora-37-desktop index d85948e..9bc5384 100644 --- a/dockerfile-kasm-fedora-37-desktop +++ b/dockerfile-kasm-fedora-37-desktop @@ -13,7 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-java-dev b/dockerfile-kasm-java-dev index 3aad8e3..32d97e6 100644 --- a/dockerfile-kasm-java-dev +++ b/dockerfile-kasm-java-dev @@ -12,7 +12,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-opensuse-15-desktop b/dockerfile-kasm-opensuse-15-desktop index a020298..5356aab 100644 --- a/dockerfile-kasm-opensuse-15-desktop +++ b/dockerfile-kasm-opensuse-15-desktop @@ -13,7 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/opensuse/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-oracle-7-desktop b/dockerfile-kasm-oracle-7-desktop index d22e93f..0e92b15 100644 --- a/dockerfile-kasm-oracle-7-desktop +++ b/dockerfile-kasm-oracle-7-desktop @@ -13,7 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-oracle-8-desktop b/dockerfile-kasm-oracle-8-desktop index 41946f4..5214e91 100644 --- a/dockerfile-kasm-oracle-8-desktop +++ b/dockerfile-kasm-oracle-8-desktop @@ -13,7 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install 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/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ - ### Install Visual Studio 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/ - ### Install NextCloud COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ - ### Install Remmina COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ diff --git a/dockerfile-kasm-oracle-9-desktop b/dockerfile-kasm-oracle-9-desktop index 47baed6..66bc9b2 100644 --- a/dockerfile-kasm-oracle-9-desktop +++ b/dockerfile-kasm-oracle-9-desktop @@ -13,7 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-parrotos-5-desktop b/dockerfile-kasm-parrotos-5-desktop index 6ac7b86..6509ec9 100644 --- a/dockerfile-kasm-parrotos-5-desktop +++ b/dockerfile-kasm-parrotos-5-desktop @@ -6,6 +6,7 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-remnux-focal-desktop b/dockerfile-kasm-remnux-focal-desktop index d8457d9..bf2f4f9 100644 --- a/dockerfile-kasm-remnux-focal-desktop +++ b/dockerfile-kasm-remnux-focal-desktop @@ -10,7 +10,6 @@ WORKDIR $HOME ######### Customize Container Here ########### - # Install Remnux Utils COPY ./src/ubuntu/install/remnux $INST_SCRIPTS/remnux/ RUN bash $INST_SCRIPTS/remnux/install_remnux.sh && rm -rf $INST_SCRIPTS/remnux/ diff --git a/dockerfile-kasm-rockylinux-9-desktop b/dockerfile-kasm-rockylinux-9-desktop index f97cad0..4ea76f4 100644 --- a/dockerfile-kasm-rockylinux-9-desktop +++ b/dockerfile-kasm-rockylinux-9-desktop @@ -13,7 +13,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install Tools COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ diff --git a/dockerfile-kasm-ubuntu-focal-desktop b/dockerfile-kasm-ubuntu-focal-desktop index a3bc136..4ee9c4c 100644 --- a/dockerfile-kasm-ubuntu-focal-desktop +++ b/dockerfile-kasm-ubuntu-focal-desktop @@ -12,7 +12,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install 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/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ - ### Install Visual Studio 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/ - ### Install NextCloud COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ - ### Install Remmina COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ diff --git a/dockerfile-kasm-ubuntu-focal-dind b/dockerfile-kasm-ubuntu-focal-dind index b1cbd8e..74ab70b 100644 --- a/dockerfile-kasm-ubuntu-focal-dind +++ b/dockerfile-kasm-ubuntu-focal-dind @@ -13,7 +13,9 @@ WORKDIR $HOME ENV DOCKER_CHANNEL=stable \ DOCKER_VERSION=20.10.9 \ 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/daemon.json /etc/docker/daemon.json diff --git a/dockerfile-kasm-ubuntu-focal-dind-rootless b/dockerfile-kasm-ubuntu-focal-dind-rootless index 38cae54..1c41684 100644 --- a/dockerfile-kasm-ubuntu-focal-dind-rootless +++ b/dockerfile-kasm-ubuntu-focal-dind-rootless @@ -11,7 +11,8 @@ WORKDIR $HOME ######### Customize Container Here ########### 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 && \ mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR @@ -64,4 +65,4 @@ ENV HOME /home/kasm-user WORKDIR $HOME RUN mkdir -p $HOME && chown -R 1000:0 $HOME -USER 1000 \ No newline at end of file +USER 1000 diff --git a/dockerfile-kasm-ubuntu-jammy-desktop b/dockerfile-kasm-ubuntu-jammy-desktop index c4a2a41..eccb70d 100644 --- a/dockerfile-kasm-ubuntu-jammy-desktop +++ b/dockerfile-kasm-ubuntu-jammy-desktop @@ -12,7 +12,7 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install - +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" ### Install 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/ RUN bash $INST_SCRIPTS/sublime_text/install_sublime_text.sh && rm -rf $INST_SCRIPTS/sublime_text/ - ### Install Visual Studio 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/ - ### Install NextCloud COPY ./src/ubuntu/install/nextcloud $INST_SCRIPTS/nextcloud/ RUN bash $INST_SCRIPTS/nextcloud/install_nextcloud.sh && rm -rf $INST_SCRIPTS/nextcloud/ - ### Install Remmina COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ diff --git a/dockerfile-kasm-ubuntu-jammy-dind b/dockerfile-kasm-ubuntu-jammy-dind index ddb7c40..6186227 100644 --- a/dockerfile-kasm-ubuntu-jammy-dind +++ b/dockerfile-kasm-ubuntu-jammy-dind @@ -13,7 +13,8 @@ WORKDIR $HOME ENV DOCKER_CHANNEL=stable \ DOCKER_VERSION=20.10.9 \ 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/daemon.json /etc/docker/daemon.json diff --git a/dockerfile-kasm-ubuntu-jammy-dind-rootless b/dockerfile-kasm-ubuntu-jammy-dind-rootless index 363bd31..72f6eb7 100644 --- a/dockerfile-kasm-ubuntu-jammy-dind-rootless +++ b/dockerfile-kasm-ubuntu-jammy-dind-rootless @@ -11,7 +11,8 @@ WORKDIR $HOME ######### Customize Container Here ########### 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 && \ mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR diff --git a/dockerfile-kasm-vs-code b/dockerfile-kasm-vs-code index 58fb3ab..76a0c29 100644 --- a/dockerfile-kasm-vs-code +++ b/dockerfile-kasm-vs-code @@ -6,11 +6,11 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install +ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" WORKDIR $HOME ######### Customize Container Here ########### - 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/