From e03153a3c97fae70f9de76f05ee1ad3b87a51daf Mon Sep 17 00:00:00 2001 From: Richard Koliser Date: Wed, 23 Mar 2022 17:15:14 -0400 Subject: [PATCH] KASM-2193 Removed unused env variable BASE_IMAGE --- dockerfile-kasm-brave | 1 - dockerfile-kasm-chrome | 1 - dockerfile-kasm-chrome-flash | 1 - dockerfile-kasm-chromium | 1 - dockerfile-kasm-desktop | 1 - dockerfile-kasm-desktop-deluxe | 1 - dockerfile-kasm-discord | 1 - dockerfile-kasm-doom | 1 - dockerfile-kasm-edge | 1 - dockerfile-kasm-firefox | 1 - dockerfile-kasm-firefox-flash | 1 - dockerfile-kasm-firefox-mobile | 1 - dockerfile-kasm-gimp | 1 - dockerfile-kasm-hunchly | 1 - dockerfile-kasm-insomnia | 1 - dockerfile-kasm-java-dev | 1 - dockerfile-kasm-maltego | 1 - dockerfile-kasm-only-office | 1 - dockerfile-kasm-postman | 1 - dockerfile-kasm-rdesktop | 1 - dockerfile-kasm-remmina | 1 - dockerfile-kasm-signal | 1 - dockerfile-kasm-slack | 1 - dockerfile-kasm-steam | 1 - dockerfile-kasm-sublime-text | 1 - dockerfile-kasm-teams | 1 - dockerfile-kasm-telegram | 1 - dockerfile-kasm-terminal | 1 - dockerfile-kasm-tor-browser | 1 - dockerfile-kasm-ubuntu-focal-desktop | 1 - dockerfile-kasm-ubuntu-focal-dind | 1 - dockerfile-kasm-ubuntu-focal-dind-rootless | 1 - dockerfile-kasm-vlc | 1 - dockerfile-kasm-vmware-horizon | 1 - dockerfile-kasm-vs-code | 1 - dockerfile-kasm-zoom | 1 - dockerfile-kasm-zsnes | 1 - 37 files changed, 37 deletions(-) diff --git a/dockerfile-kasm-brave b/dockerfile-kasm-brave index 9270810..3ef8f32 100644 --- a/dockerfile-kasm-brave +++ b/dockerfile-kasm-brave @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-chrome b/dockerfile-kasm-chrome index e23768b..aaf4046 100644 --- a/dockerfile-kasm-chrome +++ b/dockerfile-kasm-chrome @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-chrome-flash b/dockerfile-kasm-chrome-flash index d4d8040..30837e8 100644 --- a/dockerfile-kasm-chrome-flash +++ b/dockerfile-kasm-chrome-flash @@ -7,7 +7,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-chromium b/dockerfile-kasm-chromium index 73dea1f..5e843de 100644 --- a/dockerfile-kasm-chromium +++ b/dockerfile-kasm-chromium @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-desktop b/dockerfile-kasm-desktop index f77a61a..ec45dcf 100644 --- a/dockerfile-kasm-desktop +++ b/dockerfile-kasm-desktop @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-desktop-deluxe b/dockerfile-kasm-desktop-deluxe index 2aaf146..565ecc5 100644 --- a/dockerfile-kasm-desktop-deluxe +++ b/dockerfile-kasm-desktop-deluxe @@ -12,7 +12,6 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE # Add Kasm Branding RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png diff --git a/dockerfile-kasm-discord b/dockerfile-kasm-discord index 10fc9dd..fc084c8 100644 --- a/dockerfile-kasm-discord +++ b/dockerfile-kasm-discord @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-doom b/dockerfile-kasm-doom index 3a3a966..4589f65 100644 --- a/dockerfile-kasm-doom +++ b/dockerfile-kasm-doom @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-edge b/dockerfile-kasm-edge index 0153b91..20a5b28 100644 --- a/dockerfile-kasm-edge +++ b/dockerfile-kasm-edge @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-firefox b/dockerfile-kasm-firefox index e1357ed..5b118d8 100644 --- a/dockerfile-kasm-firefox +++ b/dockerfile-kasm-firefox @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-firefox-flash b/dockerfile-kasm-firefox-flash index 8094c8a..5b0c834 100644 --- a/dockerfile-kasm-firefox-flash +++ b/dockerfile-kasm-firefox-flash @@ -7,7 +7,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-firefox-mobile b/dockerfile-kasm-firefox-mobile index 26419ad..d4293b1 100644 --- a/dockerfile-kasm-firefox-mobile +++ b/dockerfile-kasm-firefox-mobile @@ -12,7 +12,6 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE # Install Firefox COPY ./src/ubuntu/install/firefox/ $INST_SCRIPTS/firefox/ diff --git a/dockerfile-kasm-gimp b/dockerfile-kasm-gimp index affde2b..0ae0c98 100644 --- a/dockerfile-kasm-gimp +++ b/dockerfile-kasm-gimp @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-hunchly b/dockerfile-kasm-hunchly index c8411e0..4848164 100644 --- a/dockerfile-kasm-hunchly +++ b/dockerfile-kasm-hunchly @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/ -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-insomnia b/dockerfile-kasm-insomnia index d422e25..744b858 100644 --- a/dockerfile-kasm-insomnia +++ b/dockerfile-kasm-insomnia @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-java-dev b/dockerfile-kasm-java-dev index ed4bc59..3aad8e3 100644 --- a/dockerfile-kasm-java-dev +++ b/dockerfile-kasm-java-dev @@ -12,7 +12,6 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE ### Install Tools diff --git a/dockerfile-kasm-maltego b/dockerfile-kasm-maltego index b6cc10a..a4dfc6d 100644 --- a/dockerfile-kasm-maltego +++ b/dockerfile-kasm-maltego @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-only-office b/dockerfile-kasm-only-office index 0693e7f..b7e655d 100644 --- a/dockerfile-kasm-only-office +++ b/dockerfile-kasm-only-office @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-postman b/dockerfile-kasm-postman index 8cd0ac6..04acf27 100644 --- a/dockerfile-kasm-postman +++ b/dockerfile-kasm-postman @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-rdesktop b/dockerfile-kasm-rdesktop index d3bd12d..82e9e85 100644 --- a/dockerfile-kasm-rdesktop +++ b/dockerfile-kasm-rdesktop @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-remmina b/dockerfile-kasm-remmina index f779e28..a36dc24 100644 --- a/dockerfile-kasm-remmina +++ b/dockerfile-kasm-remmina @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-signal b/dockerfile-kasm-signal index dff5406..03a82bb 100644 --- a/dockerfile-kasm-signal +++ b/dockerfile-kasm-signal @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-slack b/dockerfile-kasm-slack index 8465829..20e8fbc 100644 --- a/dockerfile-kasm-slack +++ b/dockerfile-kasm-slack @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-steam b/dockerfile-kasm-steam index 4ee0970..612e525 100644 --- a/dockerfile-kasm-steam +++ b/dockerfile-kasm-steam @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-sublime-text b/dockerfile-kasm-sublime-text index 881389e..f735299 100644 --- a/dockerfile-kasm-sublime-text +++ b/dockerfile-kasm-sublime-text @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-teams b/dockerfile-kasm-teams index cb54d16..59af37c 100644 --- a/dockerfile-kasm-teams +++ b/dockerfile-kasm-teams @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-telegram b/dockerfile-kasm-telegram index f3d4cbb..b40f1ca 100644 --- a/dockerfile-kasm-telegram +++ b/dockerfile-kasm-telegram @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-terminal b/dockerfile-kasm-terminal index 6122494..0bbaa26 100644 --- a/dockerfile-kasm-terminal +++ b/dockerfile-kasm-terminal @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-tor-browser b/dockerfile-kasm-tor-browser index 9c5c80e..a19b212 100644 --- a/dockerfile-kasm-tor-browser +++ b/dockerfile-kasm-tor-browser @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE # TODO: Once we satisfy KASM-1423, move these to the core images instead ENV PULSE_RUNTIME_PATH "/tmp/pulse" ENV PULSE_STATE_PATH "/tmp/pulse" diff --git a/dockerfile-kasm-ubuntu-focal-desktop b/dockerfile-kasm-ubuntu-focal-desktop index 2d239ac..3cfa1ff 100644 --- a/dockerfile-kasm-ubuntu-focal-desktop +++ b/dockerfile-kasm-ubuntu-focal-desktop @@ -12,7 +12,6 @@ WORKDIR $HOME ENV DEBIAN_FRONTEND noninteractive ENV KASM_RX_HOME $STARTUPDIR/kasmrx ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE ### Install Tools diff --git a/dockerfile-kasm-ubuntu-focal-dind b/dockerfile-kasm-ubuntu-focal-dind index d95c697..b1cbd8e 100644 --- a/dockerfile-kasm-ubuntu-focal-dind +++ b/dockerfile-kasm-ubuntu-focal-dind @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-ubuntu-focal-dind-rootless b/dockerfile-kasm-ubuntu-focal-dind-rootless index 547b1cb..d2f6c21 100644 --- a/dockerfile-kasm-ubuntu-focal-dind-rootless +++ b/dockerfile-kasm-ubuntu-focal-dind-rootless @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-vlc b/dockerfile-kasm-vlc index f2e20ae..d65a563 100644 --- a/dockerfile-kasm-vlc +++ b/dockerfile-kasm-vlc @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-vmware-horizon b/dockerfile-kasm-vmware-horizon index e5edc5a..71c81e7 100644 --- a/dockerfile-kasm-vmware-horizon +++ b/dockerfile-kasm-vmware-horizon @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-vs-code b/dockerfile-kasm-vs-code index c6a3df2..58fb3ab 100644 --- a/dockerfile-kasm-vs-code +++ b/dockerfile-kasm-vs-code @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-zoom b/dockerfile-kasm-zoom index 9ca3f5f..fdb7cdb 100644 --- a/dockerfile-kasm-zoom +++ b/dockerfile-kasm-zoom @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ########### diff --git a/dockerfile-kasm-zsnes b/dockerfile-kasm-zsnes index e744c5e..9444eb3 100644 --- a/dockerfile-kasm-zsnes +++ b/dockerfile-kasm-zsnes @@ -6,7 +6,6 @@ USER root ENV HOME /home/kasm-default-profile ENV STARTUPDIR /dockerstartup ENV INST_SCRIPTS $STARTUPDIR/install -ENV BASE_IMAGE $BASE_IMAGE WORKDIR $HOME ######### Customize Container Here ###########