From 40af2c4aae8b74d9beb21317efdfbb12aebaaa92 Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Tue, 2 May 2023 04:05:59 +0000 Subject: [PATCH] KASM-4323 KASM-4320 Layering and Locales --- dockerfile-kasm-almalinux-8-desktop | 108 +++++---------- dockerfile-kasm-almalinux-9-desktop | 101 +++++--------- dockerfile-kasm-alpine-317-desktop | 112 +++++----------- dockerfile-kasm-centos-7-desktop | 49 +++---- dockerfile-kasm-debian-bullseye-desktop | 122 ++++++----------- dockerfile-kasm-fedora-37-desktop | 101 +++++--------- dockerfile-kasm-kali-rolling-desktop | 46 ++++--- dockerfile-kasm-opensuse-15-desktop | 106 +++++---------- dockerfile-kasm-oracle-7-desktop | 101 +++++--------- dockerfile-kasm-oracle-8-desktop | 111 +++++---------- dockerfile-kasm-oracle-9-desktop | 102 +++++--------- dockerfile-kasm-parrotos-5-desktop | 46 ++++--- dockerfile-kasm-rockylinux-8-desktop | 107 +++++---------- dockerfile-kasm-rockylinux-9-desktop | 101 +++++--------- dockerfile-kasm-ubuntu-focal-desktop | 126 ++++++------------ dockerfile-kasm-ubuntu-focal-dind | 73 +++++----- dockerfile-kasm-ubuntu-focal-dind-rootless | 64 +++++---- dockerfile-kasm-ubuntu-jammy-desktop | 125 ++++++----------- dockerfile-kasm-ubuntu-jammy-dind | 72 +++++----- dockerfile-kasm-ubuntu-jammy-dind-rootless | 64 +++++---- .../install/ansible/install_ansible.sh | 4 +- src/opensuse/install/gimp/install_gimp.sh | 4 +- .../libre_office/install_libre_office.sh | 4 +- src/opensuse/install/misc/install_tools.sh | 5 +- src/opensuse/install/slack/install_slack.sh | 4 +- .../sublime_text/install_sublime_text.sh | 4 +- .../install/telegram/install_telegram.sh | 4 +- .../install/terraform/install_terraform.sh | 4 +- .../install/tools/install_tools_deluxe.sh | 4 +- .../install/vs_code/install_vs_code.sh | 4 +- src/opensuse/install/zoom/install_zoom.sh | 4 +- src/oracle/install/ansible/install_ansible.sh | 8 +- src/oracle/install/gimp/install_gimp.sh | 8 +- .../libre_office/install_libre_office.sh | 8 +- src/oracle/install/misc/install_tools.sh | 8 +- src/oracle/install/obs/install_obs.sh | 8 +- .../only_office/install_only_office.sh | 8 +- src/oracle/install/slack/install_slack.sh | 8 +- .../sublime_text/install_sublime_text.sh | 8 +- src/oracle/install/teams/install_teams.sh | 8 +- .../install/telegram/install_telegram.sh | 4 +- .../install/terraform/install_terraform.sh | 12 +- .../install/tools/install_tools_deluxe.sh | 8 +- src/oracle/install/vs_code/install_vs_code.sh | 8 +- src/oracle/install/zoom/install_zoom.sh | 8 +- src/ubuntu/install/brave/install_brave.sh | 7 + src/ubuntu/install/chrome/install_chrome.sh | 18 ++- .../install/chromium/install_chromium.sh | 31 ++++- src/ubuntu/install/cleanup/cleanup.sh | 56 ++++++++ src/ubuntu/install/dind/custom_startup.sh | 28 +--- src/ubuntu/install/dind/dockerd.conf | 2 +- src/ubuntu/install/dind/install_dind.sh | 79 ++++++----- src/ubuntu/install/dind/modprobe | 20 --- src/ubuntu/install/edge/install_edge.sh | 6 + src/ubuntu/install/firefox/install_firefox.sh | 24 +++- .../gamepad_utils/install_gamepad_utils.sh | 9 +- src/ubuntu/install/kali/install_kali.sh | 11 +- .../install/langpacks/install_langpacks.sh | 19 +++ .../install/minetest/install_minetest.sh | 9 +- .../install/nextcloud/install_nextcloud.sh | 20 ++- src/ubuntu/install/parrot/install_parrot.sh | 11 +- src/ubuntu/install/remmina/install_remmina.sh | 28 +++- src/ubuntu/install/remnux/install_remnux.sh | 8 +- .../install/retroarch/install_retroarch.sh | 9 +- .../thunderbird/install_thunderbird.sh | 21 ++- .../install/tracelabs/install_tracelabs.sh | 44 +++--- src/ubuntu/install/vivaldi/install_vivaldi.sh | 9 +- src/ubuntu/install/vs_code/install_vs_code.sh | 9 +- 68 files changed, 1102 insertions(+), 1370 deletions(-) create mode 100644 src/ubuntu/install/cleanup/cleanup.sh delete mode 100644 src/ubuntu/install/dind/modprobe create mode 100644 src/ubuntu/install/langpacks/install_langpacks.sh diff --git a/dockerfile-kasm-almalinux-8-desktop b/dockerfile-kasm-almalinux-8-desktop index 53e38ad..5e21e4f 100644 --- a/dockerfile-kasm-almalinux-8-desktop +++ b/dockerfile-kasm-almalinux-8-desktop @@ -10,84 +10,46 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/nextcloud/install_nextcloud.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /oracle/install/obs/install_obs.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" +# Copy install scripts +COPY ./src/ $INST_DIR -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ - -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install OBS Studio -COPY ./src/oracle/install/obs $INST_SCRIPTS/obs/ -RUN bash $INST_SCRIPTS/obs/install_obs.sh && rm -rf $INST_SCRIPTS/obs/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-almalinux-9-desktop b/dockerfile-kasm-almalinux-9-desktop index ae6d14d..fd6386b 100644 --- a/dockerfile-kasm-almalinux-9-desktop +++ b/dockerfile-kasm-almalinux-9-desktop @@ -10,79 +10,44 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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 Remmina -COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ -RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-alpine-317-desktop b/dockerfile-kasm-alpine-317-desktop index 05b013c..91aee5c 100644 --- a/dockerfile-kasm-alpine-317-desktop +++ b/dockerfile-kasm-alpine-317-desktop @@ -10,88 +10,46 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV INST_SCRIPTS $STARTUPDIR/install +ENV SKIP_CLEAN=true \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/alpine/install/tools/install_tools_deluxe.sh \ + /alpine/install/misc/install_tools.sh \ + /alpine/install/chromium/install_chromium.sh \ + /alpine/install/firefox/install_firefox.sh \ + /alpine/install/remmina/install_remmina.sh \ + /alpine/install/gimp/gimp/install_gimp.sh \ + /alpine/install/ansible/install_ansible.sh \ + /alpine/install/terraform/install_terraform.sh \ + /alpine/install/thunderbird/install_thunderbird.sh \ + /alpine/install/audacity/install_audacity.sh \ + /alpine/install/blender/install_blender.sh \ + /alpine/install/geany/install_geany.sh \ + /alpine/install/inkscape/install_inkscape.sh \ + /alpine/install/libre_office/install_libre_office.sh \ + /alpine/install/pinta/install_pinta.sh \ + /alpine/install/obs/install_obs.sh \ + /alpine/install/filezilla/install_filezilla.sh \ + /ubuntu/install/langpacks/install_langpacks.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/alpine/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/alpine/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/alpine/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/alpine/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/alpine/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install Remmina -COPY ./src/alpine/install/remmina $INST_SCRIPTS/remmina/ -RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ - -### Install GIMP -COPY ./src/alpine/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Ansible -COPY ./src/alpine/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/alpine/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Thunderbird -COPY ./src/alpine/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -### Install Audacity -COPY ./src/alpine/install/audacity $INST_SCRIPTS/audacity/ -RUN bash $INST_SCRIPTS/audacity/install_audacity.sh && rm -rf $INST_SCRIPTS/audacity/ - -### Install Blender -COPY ./src/alpine/install/blender $INST_SCRIPTS/blender/ -RUN bash $INST_SCRIPTS/blender/install_blender.sh && rm -rf $INST_SCRIPTS/blender/ - -### Install Geany -COPY ./src/alpine/install/geany $INST_SCRIPTS/geany/ -RUN bash $INST_SCRIPTS/geany/install_geany.sh && rm -rf $INST_SCRIPTS/geany/ - -### Install Inkscape -COPY ./src/alpine/install/inkscape $INST_SCRIPTS/inkscape/ -RUN bash $INST_SCRIPTS/inkscape/install_inkscape.sh && rm -rf $INST_SCRIPTS/inkscape/ - -### Install LibreOffice -COPY ./src/alpine/install/libre_office $INST_SCRIPTS/libre_office/ -RUN bash $INST_SCRIPTS/libre_office/install_libre_office.sh && rm -rf $INST_SCRIPTS/libre_office/ - -### Install Pinta -COPY ./src/alpine/install/pinta $INST_SCRIPTS/pinta/ -RUN bash $INST_SCRIPTS/pinta/install_pinta.sh && rm -rf $INST_SCRIPTS/pinta/ - -### Install OBS -COPY ./src/alpine/install/obs $INST_SCRIPTS/obs/ -RUN bash $INST_SCRIPTS/obs/install_obs.sh && rm -rf $INST_SCRIPTS/obs/ - -### Install Filezilla -COPY ./src/alpine/install/filezilla $INST_SCRIPTS/filezilla/ -RUN bash $INST_SCRIPTS/filezilla/install_filezilla.sh && rm -rf $INST_SCRIPTS/filezilla/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-centos-7-desktop b/dockerfile-kasm-centos-7-desktop index f97ed9b..c449465 100644 --- a/dockerfile-kasm-centos-7-desktop +++ b/dockerfile-kasm-centos-7-desktop @@ -9,33 +9,34 @@ ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install WORKDIR $HOME -######### Customize Container Here ########### +### Envrionment config +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -# Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -######### End Customizations ########### - -RUN chown 1000:0 $HOME -RUN "$STARTUPDIR/set_user_permission.sh" $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 + +CMD ["--tail-log"] diff --git a/dockerfile-kasm-debian-bullseye-desktop b/dockerfile-kasm-debian-bullseye-desktop index f8ab66a..0a93584 100644 --- a/dockerfile-kasm-debian-bullseye-desktop +++ b/dockerfile-kasm-debian-bullseye-desktop @@ -9,93 +9,49 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \ + /ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /ubuntu/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /ubuntu/install/only_office/install_only_office.sh \ + /ubuntu/install/signal/install_signal.sh \ + /ubuntu/install/gimp/install_gimp.sh \ + /ubuntu/install/zoom/install_zoom.sh \ + /ubuntu/install/obs/install_obs.sh \ + /ubuntu/install/ansible/install_ansible.sh \ + /ubuntu/install/terraform/install_terraform.sh \ + /ubuntu/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/gamepad_utils/install_gamepad_utils.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN if [ "$(uname -m)" = "aarch64" ]; then bash $INST_SCRIPTS/chromium/install_chromium.sh; fi && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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 Remmina -COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ -RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ - -### Install Only Office -COPY ./src/ubuntu/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install Signal -COPY ./src/ubuntu/install/signal $INST_SCRIPTS/signal/ -RUN bash $INST_SCRIPTS/signal/install_signal.sh && rm -rf $INST_SCRIPTS/signal/ - -### Install GIMP -COPY ./src/ubuntu/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/ubuntu/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install OBS Studio -COPY ./src/ubuntu/install/obs $INST_SCRIPTS/obs/ -RUN bash $INST_SCRIPTS/obs/install_obs.sh && rm -rf $INST_SCRIPTS/obs/ - -### Install Ansible -COPY ./src/ubuntu/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/ubuntu/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/ubuntu/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -# Install Gamepad Testing Utils -COPY ./src/ubuntu/install/gamepad_utils $INST_SCRIPTS/gamepad_utils/ -RUN bash $INST_SCRIPTS/gamepad_utils/install_gamepad_utils.sh && rm -rf $INST_SCRIPTS/gamepad_utils/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 -CMD ["--tail-log"] +CMD ["--tail-log"] diff --git a/dockerfile-kasm-fedora-37-desktop b/dockerfile-kasm-fedora-37-desktop index 9bc5384..07be8dd 100644 --- a/dockerfile-kasm-fedora-37-desktop +++ b/dockerfile-kasm-fedora-37-desktop @@ -10,79 +10,44 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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 Remmina -COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ -RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-kali-rolling-desktop b/dockerfile-kasm-kali-rolling-desktop index 6a06744..1e1e75e 100644 --- a/dockerfile-kasm-kali-rolling-desktop +++ b/dockerfile-kasm-kali-rolling-desktop @@ -5,31 +5,37 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup -ENV INST_SCRIPTS $STARTUPDIR/install WORKDIR $HOME -######### Customize Container Here ########### +### Envrionment config +ENV DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/kali/install_kali.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /ubuntu/install/cleanup/cleanup.sh" +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Kali utils -COPY ./src/ubuntu/install/kali $INST_SCRIPTS/kali/ -RUN bash $INST_SCRIPTS/kali/install_kali.sh && rm -rf $INST_SCRIPTS/kali/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -######### End Customizations ########### - -RUN chown 1000:0 $HOME -RUN $STARTUPDIR/set_user_permission.sh $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 + +CMD ["--tail-log"] diff --git a/dockerfile-kasm-opensuse-15-desktop b/dockerfile-kasm-opensuse-15-desktop index 5356aab..8e838ff 100644 --- a/dockerfile-kasm-opensuse-15-desktop +++ b/dockerfile-kasm-opensuse-15-desktop @@ -10,81 +10,47 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/opensuse/install/tools/install_tools_deluxe.sh \ + /opensuse/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /opensuse/install/sublime_text/install_sublime_text.sh \ + /opensuse/install/vs_code/install_vs_code.sh \ + /ubuntu/install/nextcloud/install_nextcloud.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /opensuse/install/libre_office/install_libre_office.sh \ + /opensuse/install/gimp/install_gimp.sh \ + /opensuse/install/ansible/install_ansible.sh \ + /opensuse/install/terraform/install_terraform.sh \ + /opensuse/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/langpacks/install_langpacks.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/opensuse/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/opensuse/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN if [ "$(uname -m)" == "aarch64" ]; then bash $INST_SCRIPTS/chromium/install_chromium.sh; fi && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install Sublime Text -COPY ./src/opensuse/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/opensuse/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/ - -### Install Libre Office -COPY ./src/opensuse/install/libre_office $INST_SCRIPTS/libre_office/ -RUN bash $INST_SCRIPTS/libre_office/install_libre_office.sh && rm -rf $INST_SCRIPTS/libre_office/ - -### Install GIMP -COPY ./src/opensuse/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Ansible -COPY ./src/opensuse/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/opensuse/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/opensuse/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] + diff --git a/dockerfile-kasm-oracle-7-desktop b/dockerfile-kasm-oracle-7-desktop index 0e92b15..53c32fe 100644 --- a/dockerfile-kasm-oracle-7-desktop +++ b/dockerfile-kasm-oracle-7-desktop @@ -10,79 +10,44 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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 Remmina -COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ -RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-oracle-8-desktop b/dockerfile-kasm-oracle-8-desktop index 5214e91..ef7d183 100644 --- a/dockerfile-kasm-oracle-8-desktop +++ b/dockerfile-kasm-oracle-8-desktop @@ -10,87 +10,46 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/nextcloud/install_nextcloud.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/obs/install_obs.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install OBS Studio -COPY ./src/oracle/install/obs $INST_SCRIPTS/obs/ -RUN bash $INST_SCRIPTS/obs/install_obs.sh && rm -rf $INST_SCRIPTS/obs/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-oracle-9-desktop b/dockerfile-kasm-oracle-9-desktop index 66bc9b2..82100ca 100644 --- a/dockerfile-kasm-oracle-9-desktop +++ b/dockerfile-kasm-oracle-9-desktop @@ -10,79 +10,45 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/obs/install_obs.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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 Remmina -COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ -RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-parrotos-5-desktop b/dockerfile-kasm-parrotos-5-desktop index 6509ec9..fba3f79 100644 --- a/dockerfile-kasm-parrotos-5-desktop +++ b/dockerfile-kasm-parrotos-5-desktop @@ -5,31 +5,37 @@ 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 ########### +### Envrionment config +ENV DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/parrot/install_parrot.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /ubuntu/install/cleanup/cleanup.sh" -# Install Parrot utils -COPY ./src/ubuntu/install/parrot $INST_SCRIPTS/parrot/ -RUN bash $INST_SCRIPTS/parrot/install_parrot.sh && rm -rf $INST_SCRIPTS/parrot/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -######### End Customizations ########### - -RUN chown 1000:0 $HOME -RUN $STARTUPDIR/set_user_permission.sh $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 + +CMD ["--tail-log"] diff --git a/dockerfile-kasm-rockylinux-8-desktop b/dockerfile-kasm-rockylinux-8-desktop index 6e28d40..1553738 100644 --- a/dockerfile-kasm-rockylinux-8-desktop +++ b/dockerfile-kasm-rockylinux-8-desktop @@ -10,83 +10,46 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/nextcloud/install_nextcloud.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /oracle/install/obs/install_obs.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" +# Copy install scripts +COPY ./src/ $INST_DIR -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ - -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install OBS Studio -COPY ./src/oracle/install/obs $INST_SCRIPTS/obs/ -RUN bash $INST_SCRIPTS/obs/install_obs.sh && rm -rf $INST_SCRIPTS/obs/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-rockylinux-9-desktop b/dockerfile-kasm-rockylinux-9-desktop index 4ea76f4..7f99c99 100644 --- a/dockerfile-kasm-rockylinux-9-desktop +++ b/dockerfile-kasm-rockylinux-9-desktop @@ -10,79 +10,44 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/oracle/install/tools/install_tools_deluxe.sh \ + /oracle/install/misc/install_tools.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /oracle/install/sublime_text/install_sublime_text.sh \ + /oracle/install/vs_code/install_vs_code.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /oracle/install/only_office/install_only_office.sh \ + /oracle/install/gimp/install_gimp.sh \ + /oracle/install/zoom/install_zoom.sh \ + /oracle/install/ansible/install_ansible.sh \ + /oracle/install/terraform/install_terraform.sh \ + /oracle/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/oracle/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/oracle/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN bash $INST_SCRIPTS/chromium/install_chromium.sh && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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 Remmina -COPY ./src/ubuntu/install/remmina $INST_SCRIPTS/remmina/ -RUN bash $INST_SCRIPTS/remmina/install_remmina.sh && rm -rf $INST_SCRIPTS/remmina/ - -### Install Only Office -COPY ./src/oracle/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install GIMP -COPY ./src/oracle/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/oracle/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install Ansible -COPY ./src/oracle/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/oracle/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/oracle/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN rm -f /etc/X11/xinit/Xclients - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-ubuntu-focal-desktop b/dockerfile-kasm-ubuntu-focal-desktop index 4ee9c4c..4c5313d 100644 --- a/dockerfile-kasm-ubuntu-focal-desktop +++ b/dockerfile-kasm-ubuntu-focal-desktop @@ -9,97 +9,51 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \ + /ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /ubuntu/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/vs_code/install_vs_code.sh \ + /ubuntu/install/nextcloud/install_nextcloud.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /ubuntu/install/only_office/install_only_office.sh \ + /ubuntu/install/signal/install_signal.sh \ + /ubuntu/install/gimp/install_gimp.sh \ + /ubuntu/install/zoom/install_zoom.sh \ + /ubuntu/install/obs/install_obs.sh \ + /ubuntu/install/ansible/install_ansible.sh \ + /ubuntu/install/terraform/install_terraform.sh \ + /ubuntu/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/gamepad_utils/install_gamepad_utils.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN if [ "$(uname -m)" = "aarch64" ]; then bash $INST_SCRIPTS/chromium/install_chromium.sh; fi && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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/ - -### Install Only Office -COPY ./src/ubuntu/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install Signal -COPY ./src/ubuntu/install/signal $INST_SCRIPTS/signal/ -RUN bash $INST_SCRIPTS/signal/install_signal.sh && rm -rf $INST_SCRIPTS/signal/ - -### Install GIMP -COPY ./src/ubuntu/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/ubuntu/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install OBS Studio -COPY ./src/ubuntu/install/obs $INST_SCRIPTS/obs/ -RUN bash $INST_SCRIPTS/obs/install_obs.sh && rm -rf $INST_SCRIPTS/obs/ - -### Install Ansible -COPY ./src/ubuntu/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/ubuntu/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/ubuntu/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -# Install Gamepad Testing Utils -COPY ./src/ubuntu/install/gamepad_utils $INST_SCRIPTS/gamepad_utils/ -RUN bash $INST_SCRIPTS/gamepad_utils/install_gamepad_utils.sh && rm -rf $INST_SCRIPTS/gamepad_utils/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] + diff --git a/dockerfile-kasm-ubuntu-focal-dind b/dockerfile-kasm-ubuntu-focal-dind index 13711a3..41e302f 100644 --- a/dockerfile-kasm-ubuntu-focal-dind +++ b/dockerfile-kasm-ubuntu-focal-dind @@ -5,56 +5,47 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup -ENV INST_SCRIPTS $STARTUPDIR/install WORKDIR $HOME -######### Customize Container Here ########### - -ENV DOCKER_CHANNEL=stable \ - DOCKER_VERSION=20.10.9 \ - DOCKER_COMPOSE_VERSION=1.29.2 \ - DEBUG=false \ - DONT_PROMPT_WSL_INSTALL="No_Prompt_please" - - -COPY ./src/ubuntu/install/dind $INST_SCRIPTS/dind/ - -RUN bash $INST_SCRIPTS/dind/install_dind.sh && rm -rf $INST_SCRIPTS/dind/ +### Envrionment config +ENV DEBUG=false \ + DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/dind/install_dind.sh \ + /ubuntu/install/tools/install_tools_deluxe.sh \ + /ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/vs_code/install_vs_code.sh \ + /ubuntu/install/cleanup/cleanup.sh" +# Startup Scripts COPY ./src/ubuntu/install/dind/custom_startup.sh $STARTUPDIR/custom_startup.sh -RUN chmod +x $STARTUPDIR/custom_startup.sh RUN chmod 755 $STARTUPDIR/custom_startup.sh - -COPY ./src/ubuntu/install/dind/modprobe /usr/local/bin/modprobe -RUN chmod +x /usr/local/bin/modprobe COPY ./src/ubuntu/install/dind/dockerd.conf /etc/supervisor/conf.d/ -### Install Tools -COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -### Install 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/ - -### 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 Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -######### End Customizations ########### - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 + +CMD ["--tail-log"] diff --git a/dockerfile-kasm-ubuntu-focal-dind-rootless b/dockerfile-kasm-ubuntu-focal-dind-rootless index 1c41684..fcb38be 100644 --- a/dockerfile-kasm-ubuntu-focal-dind-rootless +++ b/dockerfile-kasm-ubuntu-focal-dind-rootless @@ -8,21 +8,15 @@ ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install WORKDIR $HOME -######### Customize Container Here ########### - +# Rootless Dind ENV DOCKER_BIN=/usr/local/lib/docker \ - XDG_RUNTIME_DIR=/docker \ - DONT_PROMPT_WSL_INSTALL="No_Prompt_please" - + XDG_RUNTIME_DIR=/docker RUN mkdir -p $DOCKER_BIN && chown 1000:0 $DOCKER_BIN && \ mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR - ENV PATH=$DOCKER_BIN:$DOCKER_BIN/cli-plugins:$PATH \ DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock - COPY ./src/ubuntu/install/dind_rootless/install_dind_rootless_prerequisites.sh $INST_SCRIPTS/dind_rootless/ RUN bash $INST_SCRIPTS/dind_rootless/install_dind_rootless_prerequisites.sh - COPY ./src/ubuntu/install/dind_rootless/install_dind_rootless.sh $INST_SCRIPTS/dind_rootless/ RUN chown 1000:1000 $INST_SCRIPTS/dind_rootless/install_dind_rootless.sh # It's recommended that docker-rootless be installed by non root user @@ -30,39 +24,43 @@ USER 1000 RUN bash $INST_SCRIPTS/dind_rootless/install_dind_rootless.sh USER root RUN rm -rf $INST_SCRIPTS/dind_rootless - COPY ./src/ubuntu/install/dind_rootless/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh && chmod 755 $STARTUPDIR/custom_startup.sh - COPY ./src/ubuntu/install/dind_rootless/modprobe /usr/local/bin/modprobe RUN chmod +x /usr/local/bin/modprobe -### Install Tools -COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +### Envrionment config +ENV DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \ + /ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/vs_code/install_vs_code.sh \ + /ubuntu/install/cleanup/cleanup.sh" -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ +# Copy install scripts +COPY ./src/ $INST_DIR -### Install 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/ - -### 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 Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -######### End Customizations ########### - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 + +CMD ["--tail-log"] diff --git a/dockerfile-kasm-ubuntu-jammy-desktop b/dockerfile-kasm-ubuntu-jammy-desktop index eccb70d..6bd9487 100644 --- a/dockerfile-kasm-ubuntu-jammy-desktop +++ b/dockerfile-kasm-ubuntu-jammy-desktop @@ -9,97 +9,50 @@ ENV STARTUPDIR /dockerstartup WORKDIR $HOME ### Envrionment config -ENV DEBIAN_FRONTEND noninteractive -ENV KASM_RX_HOME $STARTUPDIR/kasmrx -ENV INST_SCRIPTS $STARTUPDIR/install -ENV DONT_PROMPT_WSL_INSTALL "No_Prompt_please" +ENV DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \ + /ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/firefox/install_firefox.sh \ + /ubuntu/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/vs_code/install_vs_code.sh \ + /ubuntu/install/nextcloud/install_nextcloud.sh \ + /ubuntu/install/remmina/install_remmina.sh \ + /ubuntu/install/only_office/install_only_office.sh \ + /ubuntu/install/signal/install_signal.sh \ + /ubuntu/install/gimp/install_gimp.sh \ + /ubuntu/install/zoom/install_zoom.sh \ + /ubuntu/install/obs/install_obs.sh \ + /ubuntu/install/ansible/install_ansible.sh \ + /ubuntu/install/terraform/install_terraform.sh \ + /ubuntu/install/telegram/install_telegram.sh \ + /ubuntu/install/thunderbird/install_thunderbird.sh \ + /ubuntu/install/gamepad_utils/install_gamepad_utils.sh \ + /ubuntu/install/cleanup/cleanup.sh" -### Install Tools -COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -# Install Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -# Install Chromium -COPY ./src/ubuntu/install/chromium $INST_SCRIPTS/chromium/ -RUN if [ "$(uname -m)" = "aarch64" ]; then bash $INST_SCRIPTS/chromium/install_chromium.sh; fi && rm -rf $INST_SCRIPTS/chromium/ - -# Install Firefox -COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ -COPY ./src/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ -RUN bash $INST_SCRIPTS/firefox/install_firefox.sh && rm -rf $INST_SCRIPTS/firefox/ - -### Install 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/ - -### 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/ - -### Install Only Office -COPY ./src/ubuntu/install/only_office $INST_SCRIPTS/only_office/ -RUN bash $INST_SCRIPTS/only_office/install_only_office.sh && rm -rf $INST_SCRIPTS/only_office/ - -### Install Signal -COPY ./src/ubuntu/install/signal $INST_SCRIPTS/signal/ -RUN bash $INST_SCRIPTS/signal/install_signal.sh && rm -rf $INST_SCRIPTS/signal/ - -### Install GIMP -COPY ./src/ubuntu/install/gimp $INST_SCRIPTS/gimp/ -RUN bash $INST_SCRIPTS/gimp/install_gimp.sh && rm -rf $INST_SCRIPTS/gimp/ - -### Install Zoom -COPY ./src/ubuntu/install/zoom $INST_SCRIPTS/zoom/ -RUN bash $INST_SCRIPTS/zoom/install_zoom.sh && rm -rf $INST_SCRIPTS/zoom/ - -### Install OBS Studio -COPY ./src/ubuntu/install/obs $INST_SCRIPTS/obs/ -RUN bash $INST_SCRIPTS/obs/install_obs.sh && rm -rf $INST_SCRIPTS/obs/ - -### Install Ansible -COPY ./src/ubuntu/install/ansible $INST_SCRIPTS/ansible/ -RUN bash $INST_SCRIPTS/ansible/install_ansible.sh && rm -rf $INST_SCRIPTS/ansible/ - -### Install Terraform -COPY ./src/ubuntu/install/terraform $INST_SCRIPTS/terraform/ -RUN bash $INST_SCRIPTS/terraform/install_terraform.sh && rm -rf $INST_SCRIPTS/terraform/ - -### Install Telegram -COPY ./src/ubuntu/install/telegram $INST_SCRIPTS/telegram/ -RUN bash $INST_SCRIPTS/telegram/install_telegram.sh && rm -rf $INST_SCRIPTS/telegram/ - -### Install Thunderbird -COPY ./src/ubuntu/install/thunderbird $INST_SCRIPTS/thunderbird/ -RUN bash $INST_SCRIPTS/thunderbird/install_thunderbird.sh && rm -rf $INST_SCRIPTS/thunderbird/ - -# Install Gamepad Testing Utils -COPY ./src/ubuntu/install/gamepad_utils $INST_SCRIPTS/gamepad_utils/ -RUN bash $INST_SCRIPTS/gamepad_utils/install_gamepad_utils.sh && rm -rf $INST_SCRIPTS/gamepad_utils/ - -#ADD ./src/common/scripts $STARTUPDIR -RUN $STARTUPDIR/set_user_permission.sh $HOME - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 CMD ["--tail-log"] diff --git a/dockerfile-kasm-ubuntu-jammy-dind b/dockerfile-kasm-ubuntu-jammy-dind index 8b1fb93..5e9f394 100644 --- a/dockerfile-kasm-ubuntu-jammy-dind +++ b/dockerfile-kasm-ubuntu-jammy-dind @@ -5,55 +5,47 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup -ENV INST_SCRIPTS $STARTUPDIR/install WORKDIR $HOME -######### Customize Container Here ########### - -ENV DOCKER_CHANNEL=stable \ - DOCKER_VERSION=20.10.9 \ - DOCKER_COMPOSE_VERSION=1.29.2 \ - DEBUG=false \ - DONT_PROMPT_WSL_INSTALL="No_Prompt_please" - -COPY ./src/ubuntu/install/dind $INST_SCRIPTS/dind/ - -RUN bash $INST_SCRIPTS/dind/install_dind.sh && rm -rf $INST_SCRIPTS/dind/ +### Envrionment config +ENV DEBUG=false \ + DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/dind/install_dind.sh \ + /ubuntu/install/tools/install_tools_deluxe.sh \ + /ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/vs_code/install_vs_code.sh \ + /ubuntu/install/cleanup/cleanup.sh" +# Startup Scripts COPY ./src/ubuntu/install/dind/custom_startup.sh $STARTUPDIR/custom_startup.sh -RUN chmod +x $STARTUPDIR/custom_startup.sh RUN chmod 755 $STARTUPDIR/custom_startup.sh - -COPY ./src/ubuntu/install/dind/modprobe /usr/local/bin/modprobe -RUN chmod +x /usr/local/bin/modprobe COPY ./src/ubuntu/install/dind/dockerd.conf /etc/supervisor/conf.d/ -### Install Tools -COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +# Copy install scripts +COPY ./src/ $INST_DIR -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ - -### Install 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/ - -### 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 Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -######### End Customizations ########### - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 + +CMD ["--tail-log"] diff --git a/dockerfile-kasm-ubuntu-jammy-dind-rootless b/dockerfile-kasm-ubuntu-jammy-dind-rootless index 72f6eb7..06fd7b4 100644 --- a/dockerfile-kasm-ubuntu-jammy-dind-rootless +++ b/dockerfile-kasm-ubuntu-jammy-dind-rootless @@ -8,21 +8,15 @@ ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install WORKDIR $HOME -######### Customize Container Here ########### - +# Rootless Dind ENV DOCKER_BIN=/usr/local/lib/docker \ - XDG_RUNTIME_DIR=/docker \ - DONT_PROMPT_WSL_INSTALL="No_Prompt_please" - + XDG_RUNTIME_DIR=/docker RUN mkdir -p $DOCKER_BIN && chown 1000:0 $DOCKER_BIN && \ mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR - ENV PATH=$DOCKER_BIN:$DOCKER_BIN/cli-plugins:$PATH \ DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock - COPY ./src/ubuntu/install/dind_rootless/install_dind_rootless_prerequisites.sh $INST_SCRIPTS/dind_rootless/ RUN bash $INST_SCRIPTS/dind_rootless/install_dind_rootless_prerequisites.sh - COPY ./src/ubuntu/install/dind_rootless/install_dind_rootless.sh $INST_SCRIPTS/dind_rootless/ RUN chown 1000:1000 $INST_SCRIPTS/dind_rootless/install_dind_rootless.sh # It's recommended that docker-rootless be installed by non root user @@ -30,39 +24,43 @@ USER 1000 RUN bash $INST_SCRIPTS/dind_rootless/install_dind_rootless.sh USER root RUN rm -rf $INST_SCRIPTS/dind_rootless - COPY ./src/ubuntu/install/dind_rootless/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh && chmod 755 $STARTUPDIR/custom_startup.sh - COPY ./src/ubuntu/install/dind_rootless/modprobe /usr/local/bin/modprobe RUN chmod +x /usr/local/bin/modprobe -### Install Tools -COPY ./src/ubuntu/install/tools $INST_SCRIPTS/tools/ -RUN bash $INST_SCRIPTS/tools/install_tools_deluxe.sh && rm -rf $INST_SCRIPTS/tools/ +### Envrionment config +ENV DEBIAN_FRONTEND=noninteractive \ + SKIP_CLEAN=true \ + KASM_RX_HOME=$STARTUPDIR/kasmrx \ + DONT_PROMPT_WSL_INSTALL="No_Prompt_please" \ + INST_DIR=$STARTUPDIR/install \ + INST_SCRIPTS="/ubuntu/install/tools/install_tools_deluxe.sh \ + /ubuntu/install/misc/install_tools.sh \ + /ubuntu/install/chrome/install_chrome.sh \ + /ubuntu/install/chromium/install_chromium.sh \ + /ubuntu/install/sublime_text/install_sublime_text.sh \ + /ubuntu/install/vs_code/install_vs_code.sh \ + /ubuntu/install/cleanup/cleanup.sh" -# Install Utilities -COPY ./src/ubuntu/install/misc $INST_SCRIPTS/misc/ -RUN bash $INST_SCRIPTS/misc/install_tools.sh && rm -rf $INST_SCRIPTS/misc/ +# Copy install scripts +COPY ./src/ $INST_DIR -### Install 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/ - -### 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 Google Chrome -COPY ./src/ubuntu/install/chrome $INST_SCRIPTS/chrome/ -RUN bash $INST_SCRIPTS/chrome/install_chrome.sh && rm -rf $INST_SCRIPTS/chrome/ - -######### End Customizations ########### - -RUN chown 1000:0 $HOME +# Run installations +RUN \ + for SCRIPT in $INST_SCRIPTS; do \ + bash ${INST_DIR}${SCRIPT}; \ + done && \ + $STARTUPDIR/set_user_permission.sh $HOME && \ + rm -f /etc/X11/xinit/Xclients && \ + chown 1000:0 $HOME && \ + mkdir -p /home/kasm-user && \ + chown -R 1000:0 /home/kasm-user && \ + rm -Rf ${INST_DIR} +# Userspace Runtime ENV HOME /home/kasm-user WORKDIR $HOME -RUN mkdir -p $HOME && chown -R 1000:0 $HOME - USER 1000 + +CMD ["--tail-log"] diff --git a/src/opensuse/install/ansible/install_ansible.sh b/src/opensuse/install/ansible/install_ansible.sh index d566dae..0aa800d 100644 --- a/src/opensuse/install/ansible/install_ansible.sh +++ b/src/opensuse/install/ansible/install_ansible.sh @@ -2,4 +2,6 @@ set -ex zypper install -yn ansible -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi diff --git a/src/opensuse/install/gimp/install_gimp.sh b/src/opensuse/install/gimp/install_gimp.sh index e0a686f..3e59929 100644 --- a/src/opensuse/install/gimp/install_gimp.sh +++ b/src/opensuse/install/gimp/install_gimp.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash zypper install -yn gimp -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi cp /usr/share/applications/gimp.desktop $HOME/Desktop/ chmod +x $HOME/Desktop/gimp.desktop diff --git a/src/opensuse/install/libre_office/install_libre_office.sh b/src/opensuse/install/libre_office/install_libre_office.sh index e63e3d2..27c29e2 100644 --- a/src/opensuse/install/libre_office/install_libre_office.sh +++ b/src/opensuse/install/libre_office/install_libre_office.sh @@ -9,7 +9,9 @@ zypper install -yn \ libreoffice-impress \ libreoffice-math \ libreoffice-writer -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi cp /usr/share/applications/libreoffice-startcenter.desktop $HOME/Desktop/ chmod +x $HOME/Desktop/libreoffice-startcenter.desktop chown 1000:1000 $HOME/Desktop/libreoffice-startcenter.desktop diff --git a/src/opensuse/install/misc/install_tools.sh b/src/opensuse/install/misc/install_tools.sh index 6639685..01cb758 100644 --- a/src/opensuse/install/misc/install_tools.sh +++ b/src/opensuse/install/misc/install_tools.sh @@ -2,4 +2,7 @@ set -ex zypper install -yn nano zip wget xdotool -zypper clean --all + +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi diff --git a/src/opensuse/install/slack/install_slack.sh b/src/opensuse/install/slack/install_slack.sh index b692c91..a48c24a 100644 --- a/src/opensuse/install/slack/install_slack.sh +++ b/src/opensuse/install/slack/install_slack.sh @@ -23,7 +23,9 @@ version=4.12.2 wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.fc21.x86_64.rpm -O slack.rpm zypper install -yn libXss1 libsecret-1-0 libappindicator3-1 rpm -i --nodeps slack.rpm -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi rm slack.rpm sed -i 's,/usr/bin/slack,/usr/bin/slack --no-sandbox,g' /usr/share/applications/slack.desktop cp /usr/share/applications/slack.desktop $HOME/Desktop/ diff --git a/src/opensuse/install/sublime_text/install_sublime_text.sh b/src/opensuse/install/sublime_text/install_sublime_text.sh index 55cf331..effc7c3 100644 --- a/src/opensuse/install/sublime_text/install_sublime_text.sh +++ b/src/opensuse/install/sublime_text/install_sublime_text.sh @@ -10,7 +10,9 @@ rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg zypper addrepo -g -f https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo zypper install -yn sublime-text -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi cp /usr/share/applications/sublime_text.desktop $HOME/Desktop/ chmod +x $HOME/Desktop/sublime_text.desktop chown 1000:1000 $HOME/Desktop/sublime_text.desktop diff --git a/src/opensuse/install/telegram/install_telegram.sh b/src/opensuse/install/telegram/install_telegram.sh index e400e1d..79ab84e 100644 --- a/src/opensuse/install/telegram/install_telegram.sh +++ b/src/opensuse/install/telegram/install_telegram.sh @@ -9,7 +9,9 @@ if [ "${ARCH}" == "arm64" ] ; then fi zypper install -yn xz -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi wget -q https://telegram.org/dl/desktop/linux -O /tmp/telegram.tgz tar -xvf /tmp/telegram.tgz -C /opt/ diff --git a/src/opensuse/install/terraform/install_terraform.sh b/src/opensuse/install/terraform/install_terraform.sh index 67db846..57428c1 100644 --- a/src/opensuse/install/terraform/install_terraform.sh +++ b/src/opensuse/install/terraform/install_terraform.sh @@ -8,4 +8,6 @@ zypper install -yn \ terraform-provider-google \ terraform-provider-kubernetes \ terraform-provider-openstack -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi diff --git a/src/opensuse/install/tools/install_tools_deluxe.sh b/src/opensuse/install/tools/install_tools_deluxe.sh index 664d1fc..bfda0c8 100644 --- a/src/opensuse/install/tools/install_tools_deluxe.sh +++ b/src/opensuse/install/tools/install_tools_deluxe.sh @@ -3,4 +3,6 @@ set -ex sed -i 's/download.opensuse.org/mirrorcache-us.opensuse.org/g' /etc/zypp/repos.d/*.repo zypper install -yn vlc git tmux -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi diff --git a/src/opensuse/install/vs_code/install_vs_code.sh b/src/opensuse/install/vs_code/install_vs_code.sh index b494328..6f4ad97 100644 --- a/src/opensuse/install/vs_code/install_vs_code.sh +++ b/src/opensuse/install/vs_code/install_vs_code.sh @@ -15,4 +15,6 @@ chown 1000:1000 $HOME/Desktop/code.desktop # Conveniences for python development zypper install -yn python3-setuptools python3-virtualenv -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi diff --git a/src/opensuse/install/zoom/install_zoom.sh b/src/opensuse/install/zoom/install_zoom.sh index fb10d65..7555679 100755 --- a/src/opensuse/install/zoom/install_zoom.sh +++ b/src/opensuse/install/zoom/install_zoom.sh @@ -12,7 +12,9 @@ wget -O /tmp/package-signing-key.pub https://zoom.us/linux/download/pubkey rpm --import /tmp/package-signing-key.pub rm -f /tmp/package-signing-key.pub zypper install -yn --allow-unsigned-rpm zoom_openSUSE_$(arch).rpm -zypper clean --all +if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all +fi rm zoom_openSUSE_$(arch).rpm sed -i 's,/usr/bin/zoom,/usr/bin/zoom --no-sandbox,g' /usr/share/applications/Zoom.desktop cp /usr/share/applications/Zoom.desktop $HOME/Desktop/ diff --git a/src/oracle/install/ansible/install_ansible.sh b/src/oracle/install/ansible/install_ansible.sh index b733e24..c7e450f 100644 --- a/src/oracle/install/ansible/install_ansible.sh +++ b/src/oracle/install/ansible/install_ansible.sh @@ -3,8 +3,12 @@ set -ex if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then dnf install -y ansible - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum install -y ansible - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi diff --git a/src/oracle/install/gimp/install_gimp.sh b/src/oracle/install/gimp/install_gimp.sh index a1ef1ce..ad2af9e 100644 --- a/src/oracle/install/gimp/install_gimp.sh +++ b/src/oracle/install/gimp/install_gimp.sh @@ -2,10 +2,14 @@ set -ex if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then dnf install -y gimp - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum install -y gimp - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi cp /usr/share/applications/gimp.desktop $HOME/Desktop/ chmod +x $HOME/Desktop/gimp.desktop diff --git a/src/oracle/install/libre_office/install_libre_office.sh b/src/oracle/install/libre_office/install_libre_office.sh index 733c7bc..c21fa67 100644 --- a/src/oracle/install/libre_office/install_libre_office.sh +++ b/src/oracle/install/libre_office/install_libre_office.sh @@ -14,7 +14,9 @@ if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almali libreoffice-impress \ libreoffice-calc \ libreoffice-base - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum install -y \ libreoffice-core \ @@ -22,7 +24,9 @@ else libreoffice-impress \ libreoffice-calc \ libreoffice-base - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi cp /usr/share/applications/libreoffice-startcenter.desktop $HOME/Desktop/ chmod +x $HOME/Desktop/libreoffice-startcenter.desktop diff --git a/src/oracle/install/misc/install_tools.sh b/src/oracle/install/misc/install_tools.sh index 623bc4a..f152d78 100644 --- a/src/oracle/install/misc/install_tools.sh +++ b/src/oracle/install/misc/install_tools.sh @@ -3,8 +3,12 @@ set -ex if [ -f /usr/bin/dnf ]; then dnf install -y nano zip wget xdotool - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum install -y nano zip wget xdotool - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi diff --git a/src/oracle/install/obs/install_obs.sh b/src/oracle/install/obs/install_obs.sh index 6e947da..dea6065 100644 --- a/src/oracle/install/obs/install_obs.sh +++ b/src/oracle/install/obs/install_obs.sh @@ -9,10 +9,14 @@ fi if [[ "${DISTRO}" == @(oracle8|rockylinux8|almalinux8) ]]; then dnf install -y obs-studio - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum install -y obs-studio - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi cp /usr/share/applications/com.obsproject.Studio.desktop $HOME/Desktop/ diff --git a/src/oracle/install/only_office/install_only_office.sh b/src/oracle/install/only_office/install_only_office.sh index 4574981..03df6ed 100644 --- a/src/oracle/install/only_office/install_only_office.sh +++ b/src/oracle/install/only_office/install_only_office.sh @@ -10,10 +10,14 @@ fi curl -L -o only_office.rpm "https://download.onlyoffice.com/install/desktop/editors/linux/onlyoffice-desktopeditors.$(arch).rpm" if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then dnf localinstall -y only_office.rpm - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum localinstall -y only_office.rpm - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi rm -rf only_office.rpm diff --git a/src/oracle/install/slack/install_slack.sh b/src/oracle/install/slack/install_slack.sh index 7b210a5..38382d1 100644 --- a/src/oracle/install/slack/install_slack.sh +++ b/src/oracle/install/slack/install_slack.sh @@ -23,10 +23,14 @@ version=4.12.2 wget -q https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/slack-${version}-0.1.fc21.x86_64.rpm -O slack.rpm if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then dnf localinstall -y slack.rpm - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum localinstall -y slack.rpm - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi rm slack.rpm sed -i 's,/usr/bin/slack,/usr/bin/slack --no-sandbox,g' /usr/share/applications/slack.desktop diff --git a/src/oracle/install/sublime_text/install_sublime_text.sh b/src/oracle/install/sublime_text/install_sublime_text.sh index 0f0d01c..f9b5df4 100644 --- a/src/oracle/install/sublime_text/install_sublime_text.sh +++ b/src/oracle/install/sublime_text/install_sublime_text.sh @@ -11,11 +11,15 @@ rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then dnf config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo dnf install -y sublime-text - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum-config-manager --add-repo https://download.sublimetext.com/rpm/stable/$(arch)/sublime-text.repo yum install -y sublime-text - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi cp /usr/share/applications/sublime_text.desktop $HOME/Desktop/ chmod +x $HOME/Desktop/sublime_text.desktop diff --git a/src/oracle/install/teams/install_teams.sh b/src/oracle/install/teams/install_teams.sh index edd73bc..472255e 100644 --- a/src/oracle/install/teams/install_teams.sh +++ b/src/oracle/install/teams/install_teams.sh @@ -11,12 +11,16 @@ fi if [ "${DISTRO}" == "oracle8" ]; then curl -L -o teams.rpm "https://go.microsoft.com/fwlink/p/?LinkID=2112907&clcid=0x409&culture=en-us&country=US" dnf localinstall -y teams.rpm - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else # el7 needs to be pinned to a previous version for libc deps curl -L -o teams.rpm "https://packages.microsoft.com/yumrepos/ms-teams/teams-1.3.00.30857-1.x86_64.rpm" yum localinstall -y teams.rpm - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi rm teams.rpm sed -i "s/Exec=teams/Exec=teams --no-sandbox/g" /usr/share/applications/teams.desktop diff --git a/src/oracle/install/telegram/install_telegram.sh b/src/oracle/install/telegram/install_telegram.sh index 5a73590..e21dd26 100644 --- a/src/oracle/install/telegram/install_telegram.sh +++ b/src/oracle/install/telegram/install_telegram.sh @@ -10,7 +10,9 @@ fi if [ "${DISTRO}" == "oracle8" ]; then dnf install -y xz - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi fi wget -q https://telegram.org/dl/desktop/linux -O /tmp/telegram.tgz diff --git a/src/oracle/install/terraform/install_terraform.sh b/src/oracle/install/terraform/install_terraform.sh index c500dcf..88ff331 100644 --- a/src/oracle/install/terraform/install_terraform.sh +++ b/src/oracle/install/terraform/install_terraform.sh @@ -11,13 +11,19 @@ fi if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8) ]]; then dnf config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo dnf install -y terraform - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi elif [ "${DISTRO}" == "fedora37" ]; then dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo dnf install -y terraform - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo yum install -y terraform - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi diff --git a/src/oracle/install/tools/install_tools_deluxe.sh b/src/oracle/install/tools/install_tools_deluxe.sh index 8c852dc..6379400 100644 --- a/src/oracle/install/tools/install_tools_deluxe.sh +++ b/src/oracle/install/tools/install_tools_deluxe.sh @@ -3,10 +3,14 @@ set -ex if [ -f /usr/bin/dnf ]; then dnf install -y vlc git tmux xz glibc-locale-source glibc-langpack-en - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum-config-manager --enable ol7_optional_latest yum install -y vlc git tmux - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi diff --git a/src/oracle/install/vs_code/install_vs_code.sh b/src/oracle/install/vs_code/install_vs_code.sh index 2ed0973..ce3b504 100644 --- a/src/oracle/install/vs_code/install_vs_code.sh +++ b/src/oracle/install/vs_code/install_vs_code.sh @@ -22,8 +22,12 @@ rm vs_code.rpm # Conveniences for python development if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then dnf install -y python3-setuptools python3-virtualenv - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum install -y python3-setuptools python3-virtualenv - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi diff --git a/src/oracle/install/zoom/install_zoom.sh b/src/oracle/install/zoom/install_zoom.sh index 0072e90..acdc0ce 100644 --- a/src/oracle/install/zoom/install_zoom.sh +++ b/src/oracle/install/zoom/install_zoom.sh @@ -10,10 +10,14 @@ fi wget -q https://zoom.us/client/latest/zoom_$(arch).rpm if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then dnf localinstall -y zoom_$(arch).rpm - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else yum localinstall -y zoom_$(arch).rpm - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi rm zoom_$(arch).rpm sed -i 's,/usr/bin/zoom,/usr/bin/zoom --no-sandbox,g' /usr/share/applications/Zoom.desktop diff --git a/src/ubuntu/install/brave/install_brave.sh b/src/ubuntu/install/brave/install_brave.sh index 064d008..5d33ee8 100644 --- a/src/ubuntu/install/brave/install_brave.sh +++ b/src/ubuntu/install/brave/install_brave.sh @@ -52,3 +52,10 @@ cat >>/etc/brave/policies/managed/disable_tor.json < \ + /etc/apt/sources.list.d/docker.list && \ + +# Install deps apt-get update apt-get install -y \ ca-certificates \ curl \ dbus-user-session \ + docker-buildx-plugin \ + docker-ce \ + docker-ce-cli \ + docker-compose-plugin \ fuse-overlayfs \ - kmod \ iptables \ + kmod \ openssh-client \ sudo \ supervisor \ uidmap \ wget -rm -rf /var/lib/apt/list/* -mkdir -p /var/log/supervisor -chown -R 1000:1000 /var/log/supervisor +# Install dind init and hacks +useradd -U dockremap +usermod -G dockremap dockremap +echo 'dockremap:165536:65536' >> /etc/subuid +echo 'dockremap:165536:65536' >> /etc/subgid +curl -o \ + /usr/local/bin/dind -L \ + https://raw.githubusercontent.com/moby/moby/master/hack/dind +chmod +x /usr/local/bin/dind +curl -o \ + /usr/local/bin/dockerd-entrypoint.sh -L \ + https://kasm-ci.s3.amazonaws.com/dockerd-entrypoint.sh +chmod +x /usr/local/bin/dockerd-entrypoint.sh +echo 'hosts: files dns' > /etc/nsswitch.conf +usermod -aG docker kasm-user -arch="$(uname --m)"; -case "$arch" in - # amd64 - x86_64) dockerArch='x86_64' ;; - # arm32v6 - armhf) dockerArch='armel' ;; - # arm32v7 - armv7) dockerArch='armhf' ;; - # arm64v8 - aarch64) dockerArch='aarch64' ;; - *) echo >&2 "error: unsupported architecture ($arch)"; exit 1 ;; -esac; - -curl -o docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-${DOCKER_VERSION}.tgz" - -tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ -rm docker.tgz - -dockerd --version -docker --version - -echo "Installing Docker Compose" -mkdir -p /usr/local/lib/docker/cli-plugins -COMPOSE_RELEASE=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); -COMPOSE_OS=$(uname -s) -curl -L https://github.com/docker/compose/releases/download/${COMPOSE_RELEASE}/docker-compose-${COMPOSE_OS,,}-$(uname -m) -o /usr/local/lib/docker/cli-plugins/docker-compose -chmod +x /usr/local/lib/docker/cli-plugins/docker-compose +# Install k3d tools +wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash +curl -o \ + /usr/local/bin/kubectl -L \ + "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${ARCH}/kubectl" +chmod +x /usr/local/bin/kubectl +# Passwordless Sudo echo 'kasm-user:kasm-user' | chpasswd echo 'kasm-user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers -groupadd docker -adduser kasm-user docker +# Cleanup +if [ -z ${SKIP_CLEAN+x} ]; then + apt-get autoclean + rm -rf \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /tmp/* +fi diff --git a/src/ubuntu/install/dind/modprobe b/src/ubuntu/install/dind/modprobe deleted file mode 100644 index b357d89..0000000 --- a/src/ubuntu/install/dind/modprobe +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/src/ubuntu/install/edge/install_edge.sh b/src/ubuntu/install/edge/install_edge.sh index 6722bfb..3af78e7 100644 --- a/src/ubuntu/install/edge/install_edge.sh +++ b/src/ubuntu/install/edge/install_edge.sh @@ -45,3 +45,9 @@ EOL mkdir -p /etc/opt/chrome/policies/ ln -s /etc/opt/edge/policies/managed /etc/opt/chrome/policies/ +if [ -z ${SKIP_CLEAN+x} ]; then + apt-get autoclean + rm -rf \ + /var/lib/apt/lists/* \ + /var/tmp/* +fi diff --git a/src/ubuntu/install/firefox/install_firefox.sh b/src/ubuntu/install/firefox/install_firefox.sh index 1b06681..9f7b9e7 100644 --- a/src/ubuntu/install/firefox/install_firefox.sh +++ b/src/ubuntu/install/firefox/install_firefox.sh @@ -1,6 +1,11 @@ #!/usr/bin/env bash set -xe +# Add icon +if [ -f /dockerstartup/install/ubuntu/install/firefox/firefox.desktop ]; then + mv /dockerstartup/install/ubuntu/install/firefox/firefox.desktop $HOME/Desktop/ +fi + ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') set_desktop_icon() { @@ -50,12 +55,18 @@ fi if [[ "${DISTRO}" == @(centos|oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then if [[ "${DISTRO}" == @(oracle8|rockylinux9|rockylinux8|oracle9|almalinux9|almalinux8|fedora37) ]]; then - dnf clean all + if [ -z ${SKIP_CLEAN+x} ]; then + dnf clean all + fi else - yum clean all + if [ -z ${SKIP_CLEAN+x} ]; then + yum clean all + fi fi elif [ "${DISTRO}" == "opensuse" ]; then - zypper clean --all + if [ -z ${SKIP_CLEAN+x} ]; then + zypper clean --all + fi else if [ "$ARCH" == "arm64" ] && [ "$(lsb_release -cs)" == "focal" ] ; then echo "Firefox flash player not supported on arm64 Ubuntu Focal Skipping" @@ -66,7 +77,12 @@ else apt-get update apt-get install -y browser-plugin-freshplayer-pepperflash apt-mark hold firefox - apt-get clean -y + if [ -z ${SKIP_CLEAN+x} ]; then + apt-get autoclean + rm -rf \ + /var/lib/apt/lists/* \ + /var/tmp/* + fi fi fi diff --git a/src/ubuntu/install/gamepad_utils/install_gamepad_utils.sh b/src/ubuntu/install/gamepad_utils/install_gamepad_utils.sh index ce79466..c22571d 100644 --- a/src/ubuntu/install/gamepad_utils/install_gamepad_utils.sh +++ b/src/ubuntu/install/gamepad_utils/install_gamepad_utils.sh @@ -12,6 +12,9 @@ if [ "${ARCH}" == "amd64" ] ; then rm /tmp/gamepadtool.deb fi - -apt-get autoclean -rm -rf /var/lib/apt/lists/* \ No newline at end of file +if [ -z ${SKIP_CLEAN+x} ]; then + apt-get autoclean + rm -rf \ + /var/lib/apt/lists/* \ + /var/tmp/* +fi diff --git a/src/ubuntu/install/kali/install_kali.sh b/src/ubuntu/install/kali/install_kali.sh index b921ea5..e95a265 100644 --- a/src/ubuntu/install/kali/install_kali.sh +++ b/src/ubuntu/install/kali/install_kali.sh @@ -25,8 +25,9 @@ apt-get purge -y \ rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop # Cleanup -rm -rf \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /tmp/* - +if [ -z ${SKIP_CLEAN+x} ]; then + apt-get autoclean + rm -rf \ + /var/lib/apt/lists/* \ + /var/tmp/* +fi diff --git a/src/ubuntu/install/langpacks/install_langpacks.sh b/src/ubuntu/install/langpacks/install_langpacks.sh new file mode 100644 index 0000000..4bc75e5 --- /dev/null +++ b/src/ubuntu/install/langpacks/install_langpacks.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +set -ex + +if [ "${DISTRO}" == "opensuse" ]; then + zypper search -t package "*-lang" | awk '{print $2}' > /tmp/lang-packages + rpm -qa --queryformat "%{NAME}\n" > /tmp/installed-packages + to_install="" + while read p; do + if grep -qw "^${p}-lang$" /tmp/lang-packages; then + to_install="$to_install ${p}-lang" + fi + done $HOME/Desktop/nextcloud.desktop < /etc/apt/preferences.d/mozilla-firefox fi apt-get install -y thunderbird + if [ -z ${SKIP_CLEAN+x} ]; then + apt-get autoclean rm -rf \ /var/lib/apt/lists/* \ /var/tmp/* + fi fi # Desktop icon diff --git a/src/ubuntu/install/tracelabs/install_tracelabs.sh b/src/ubuntu/install/tracelabs/install_tracelabs.sh index ece7b35..a2c0ed2 100644 --- a/src/ubuntu/install/tracelabs/install_tracelabs.sh +++ b/src/ubuntu/install/tracelabs/install_tracelabs.sh @@ -2,6 +2,23 @@ set -e set -x +# Install kali tools +apt-get update +apt-get install -y \ + kali-tools-top10 \ + autopsy \ + cutycapt \ + dirbuster \ + faraday \ + fern-wifi-cracker \ + guymager \ + hydra-gtk \ + king-phisher \ + legion \ + ophcrack \ + ophcrack-cli \ + sqlitebrowser + cd /tmp/ git clone https://github.com/tracelabs/tlosint-live.git cd /tmp/tlosint-live/ @@ -47,30 +64,15 @@ apt-get purge -y \ chromium rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop -# Install kali tools -apt-get update -apt-get install -y \ - kali-tools-top10 \ - autopsy \ - cutycapt \ - dirbuster \ - faraday \ - fern-wifi-cracker \ - guymager \ - hydra-gtk \ - king-phisher \ - legion \ - ophcrack \ - ophcrack-cli \ - sqlitebrowser - ### Cleanup echo "exit 0" > /usr/bin/blueman-applet rm -f /usr/share/xfce4/panel/plugins/power-manager-plugin.desktop -rm -rf \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /tmp/* +if [ -z ${SKIP_CLEAN+x} ]; then + apt-get autoclean + rm -rf \ + /var/lib/apt/lists/* \ + /var/tmp/* +fi rm -Rf /root mkdir -p /root rm -rf /tmp/tlosint-live diff --git a/src/ubuntu/install/vivaldi/install_vivaldi.sh b/src/ubuntu/install/vivaldi/install_vivaldi.sh index 44e84e2..46bad71 100644 --- a/src/ubuntu/install/vivaldi/install_vivaldi.sh +++ b/src/ubuntu/install/vivaldi/install_vivaldi.sh @@ -51,8 +51,9 @@ cat >>/etc/opt/chrome/policies/managed/default_managed_policy.json <