Merge branch 'feature/KASM-1998_default_LAUNCH_URL' into 'develop'

Resolve KASM-1998 "Feature/ default launch url"

Closes KASM-1998

See merge request kasm-technologies/internal/workspaces-images!18
This commit is contained in:
Justin Travis 2021-10-30 17:35:01 +00:00
commit b59b9b1949
12 changed files with 14 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 &

View File

@ -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

View File

@ -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 <<EOL
user_pref("extensions.torlauncher.prompt_at_startup", false);
user_pref("extensions.torlauncher.quickstart", true);
user_pref("browser.download.lastDir", "/home/kasm-user/Downloads");
EOL