From 8822d3821f55b38d50fc2e1ff73dccaa28b7f587 Mon Sep 17 00:00:00 2001 From: Justin Travis Date: Sat, 30 Oct 2021 17:35:01 +0000 Subject: [PATCH] Resolve KASM-1998 "Feature/ default launch url" --- dockerfile-kasm-brave | 2 +- dockerfile-kasm-chrome | 2 +- dockerfile-kasm-chrome-flash | 2 +- dockerfile-kasm-chromium | 2 +- dockerfile-kasm-edge | 2 +- dockerfile-kasm-firefox | 3 ++- dockerfile-kasm-firefox-flash | 3 ++- dockerfile-kasm-firefox-mobile | 2 +- dockerfile-kasm-tor-browser | 2 +- src/ubuntu/install/chromium/custom_startup.sh | 2 +- src/ubuntu/install/firefox/custom_startup.sh | 2 +- src/ubuntu/install/torbrowser/install_torbrowser.sh | 1 + 12 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dockerfile-kasm-brave b/dockerfile-kasm-brave index 4a15496..74ca3d1 100644 --- a/dockerfile-kasm-brave +++ b/dockerfile-kasm-brave @@ -20,7 +20,7 @@ RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_ RUN apt-get remove -y xfce4-panel # Setup the custom startup script that will be invoked when the container starts -ENV LAUNCH_URL http://kasmweb.com +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/brave/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-chrome b/dockerfile-kasm-chrome index 5014623..da51af3 100644 --- a/dockerfile-kasm-chrome +++ b/dockerfile-kasm-chrome @@ -20,7 +20,7 @@ RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_ RUN apt-get remove -y xfce4-panel # Setup the custom startup script that will be invoked when the container starts -ENV LAUNCH_URL http://kasmweb.com +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/chrome/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-chrome-flash b/dockerfile-kasm-chrome-flash index c9f64f5..b52295c 100644 --- a/dockerfile-kasm-chrome-flash +++ b/dockerfile-kasm-chrome-flash @@ -21,7 +21,7 @@ RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_ RUN apt-get remove -y xfce4-panel # Setup the custom startup script that will be invoked when the container starts -ENV LAUNCH_URL http://kasmweb.com +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/chrome/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-chromium b/dockerfile-kasm-chromium index cf4a028..7e74549 100644 --- a/dockerfile-kasm-chromium +++ b/dockerfile-kasm-chromium @@ -19,7 +19,7 @@ RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_ RUN apt-get remove -y xfce4-panel # Setup the custom startup script that will be invoked when the container starts -ENV LAUNCH_URL http://kasmweb.com +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/chromium/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-edge b/dockerfile-kasm-edge index 1193b35..eabf992 100644 --- a/dockerfile-kasm-edge +++ b/dockerfile-kasm-edge @@ -24,7 +24,7 @@ COPY ./src/ubuntu/install/gtk/ $INST_SCRIPTS/gtk/ RUN bash $INST_SCRIPTS/gtk/install_restricted_file_chooser.sh # Setup the custom startup script that will be invoked when the container starts -ENV LAUNCH_URL http://kasmweb.com +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/edge/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-firefox b/dockerfile-kasm-firefox index bd1c21d..c9be10a 100644 --- a/dockerfile-kasm-firefox +++ b/dockerfile-kasm-firefox @@ -20,7 +20,8 @@ RUN cp $HOME/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/* $HOME RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png RUN apt-get remove -y xfce4-panel -ENV LAUNCH_URL http://kasmweb.com +# Setup the custom startup script that will be invoked when the container starts +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/firefox/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-firefox-flash b/dockerfile-kasm-firefox-flash index bf08b19..1c04de5 100644 --- a/dockerfile-kasm-firefox-flash +++ b/dockerfile-kasm-firefox-flash @@ -20,7 +20,8 @@ RUN cp $HOME/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/* $HOME RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png RUN apt-get remove -y xfce4-panel -ENV LAUNCH_URL http://kasmweb.com +# Setup the custom startup script that will be invoked when the container starts +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/firefox/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-firefox-mobile b/dockerfile-kasm-firefox-mobile index 51a81f4..babc6d6 100644 --- a/dockerfile-kasm-firefox-mobile +++ b/dockerfile-kasm-firefox-mobile @@ -33,7 +33,7 @@ RUN bash $INST_SCRIPTS/mobile/configure_mobile.sh && rm -rf $INST_SCRIPTS/mobil # Setup the custom startup script that will be invoked when the container starts -ENV LAUNCH_URL http://kasmweb.com +#ENV LAUNCH_URL http://kasmweb.com COPY ./src/ubuntu/install/firefox_mobile/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/dockerfile-kasm-tor-browser b/dockerfile-kasm-tor-browser index fb8bfd9..7e32a10 100644 --- a/dockerfile-kasm-tor-browser +++ b/dockerfile-kasm-tor-browser @@ -24,7 +24,7 @@ COPY ./src/ubuntu/install/gtk/ $INST_SCRIPTS/gtk/ RUN bash $INST_SCRIPTS/gtk/install_restricted_file_chooser.sh # Setup the custom startup script that will be invoked when the container starts -ENV LAUNCH_URL about:blank +#ENV LAUNCH_URL about:blank COPY ./src/ubuntu/install/torbrowser/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod +x $STARTUPDIR/custom_startup.sh diff --git a/src/ubuntu/install/chromium/custom_startup.sh b/src/ubuntu/install/chromium/custom_startup.sh index d574dea..945f169 100644 --- a/src/ubuntu/install/chromium/custom_startup.sh +++ b/src/ubuntu/install/chromium/custom_startup.sh @@ -51,7 +51,7 @@ kasm_startup() { URL=$LAUNCH_URL fi - if [ -n "$URL" ] && ( [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ) ; then + if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then if [[ $MAXIMUS == 'true' ]] ; then maximus & diff --git a/src/ubuntu/install/firefox/custom_startup.sh b/src/ubuntu/install/firefox/custom_startup.sh index 6ebeb2d..c78a3ef 100644 --- a/src/ubuntu/install/firefox/custom_startup.sh +++ b/src/ubuntu/install/firefox/custom_startup.sh @@ -50,7 +50,7 @@ kasm_startup() { URL=$LAUNCH_URL fi - if [ -n "$URL" ] && ( [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ) ; then + if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then while true do if ! pgrep -x $PGREP > /dev/null diff --git a/src/ubuntu/install/torbrowser/install_torbrowser.sh b/src/ubuntu/install/torbrowser/install_torbrowser.sh index 4c3def7..1cf2882 100644 --- a/src/ubuntu/install/torbrowser/install_torbrowser.sh +++ b/src/ubuntu/install/torbrowser/install_torbrowser.sh @@ -21,6 +21,7 @@ sed -i 's/Exec=.*/Exec=sh -c \x27"$HOME\/tor-browser\/tor-browser_en-US\/Browser cat >> $TOR_HOME/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default/prefs.js <