From 69052c37094476449f112ff43ac458c6955f92ca Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Mon, 11 Apr 2022 10:08:54 +0000 Subject: [PATCH] Resolve KASM-2480 "Feature/ libreoffice images" --- .gitlab-ci.yml | 10 +-- dockerfile-kasm-libre-office | 35 ++++++++ docs/libre-office/README.md | 7 ++ docs/libre-office/description.txt | 1 + .../install/libre_office/custom_startup.sh | 81 +++++++++++++++++++ .../libre_office/install_libre_office.sh | 15 ++-- 6 files changed, 139 insertions(+), 10 deletions(-) create mode 100644 dockerfile-kasm-libre-office create mode 100644 docs/libre-office/README.md create mode 100644 docs/libre-office/description.txt create mode 100644 src/ubuntu/install/libre_office/custom_startup.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5fefde..ef71ca0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ services: variables: DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG} PLATFORM: "linux/amd64" - ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,ubuntu-focal-desktop,vlc,vs-code,doom,sublime-text,tor-browser,java-dev,telegram,opensuse-15-desktop,oracle-8-desktop," + ARM_BUILDS: ",chromium,firefox,gimp,rdesktop,remmina,terminal,ubuntu-bionic-desktop,ubuntu-focal-desktop,vlc,vs-code,doom,sublime-text,tor-browser,java-dev,telegram,opensuse-15-desktop,oracle-8-desktop,libre-office," CORE_IMAGE_TAG: "develop" CORE_IMAGE: "core-ubuntu-focal" USE_PRIVATE_IMAGES: 0 @@ -75,7 +75,7 @@ build_app_images: - aws-autoscale parallel: matrix: - - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord] + - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord, libre-office] build_ubuntu_desktop_images: stage: build @@ -201,7 +201,7 @@ build_dev_app_images: - aws-autoscale parallel: matrix: - - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord] + - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord, libre-office] build_dev_ubuntu_desktop_images: stage: build @@ -324,7 +324,7 @@ build_schedules_app_images: - aws-autoscale parallel: matrix: - - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord] + - KASM_IMAGE: [doom, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, maltego, telegram, hunchly, java-dev, terminal, vmware-horizon, remmina, rdesktop, discord, libre-office] CORE_IMAGE: [core-ubuntu-bionic, core-ubuntu-focal] build_schedules_ubuntu_desktop_images: @@ -406,4 +406,4 @@ update_readmes: - $README_PASSWORD parallel: matrix: - - KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-focal-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-focal-dind, ubuntu-focal-dind-rootless, tracelabs, java-dev, oracle-7-desktop, oracle-8-desktop, opensuse-15-desktop ] \ No newline at end of file + - KASM_IMAGE: [chrome, chromium, firefox, desktop, desktop-deluxe, firefox-mobile, tor-browser, doom, edge, terminal, vmware-horizon, remmina, rdesktop, brave, discord, sublime-text, gimp, vs-code, slack, teams, only-office, zoom, signal, steam, postman, insomnia, zsnes, vlc, ubuntu-focal-desktop, maltego, centos-7-desktop, telegram, hunchly, ubuntu-focal-dind, ubuntu-focal-dind-rootless, tracelabs, java-dev, oracle-7-desktop, oracle-8-desktop, opensuse-15-desktop, libre-office ] diff --git a/dockerfile-kasm-libre-office b/dockerfile-kasm-libre-office new file mode 100644 index 0000000..87b7f67 --- /dev/null +++ b/dockerfile-kasm-libre-office @@ -0,0 +1,35 @@ +ARG BASE_TAG="develop" +ARG BASE_IMAGE="core-ubuntu-focal" +FROM kasmweb/$BASE_IMAGE:$BASE_TAG +USER root + +ENV HOME /home/kasm-default-profile +ENV STARTUPDIR /dockerstartup +ENV INST_SCRIPTS $STARTUPDIR/install +WORKDIR $HOME + +######### Customize Container Here ########### + + +COPY ./src/ubuntu/install/libre_office $INST_SCRIPTS/libre_office/ +RUN bash $INST_SCRIPTS/libre_office/install_libre_office.sh && rm -rf $INST_SCRIPTS/libre_office/ + +COPY ./src/ubuntu/install/libre_office/custom_startup.sh $STARTUPDIR/custom_startup.sh +RUN chmod +x $STARTUPDIR/custom_startup.sh +RUN chmod 755 $STARTUPDIR/custom_startup.sh + + +# Update the desktop environment to be optimized for a single application +RUN cp $HOME/.config/xfce4/xfconf/single-application-xfce-perchannel-xml/* $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/ +RUN cp /usr/share/extra/backgrounds/bg_kasm.png /usr/share/extra/backgrounds/bg_default.png +RUN apt-get remove -y xfce4-panel + +######### End Customizations ########### + +RUN chown 1000:0 $HOME + +ENV HOME /home/kasm-user +WORKDIR $HOME +RUN mkdir -p $HOME && chown -R 1000:0 $HOME + +USER 1000 diff --git a/docs/libre-office/README.md b/docs/libre-office/README.md new file mode 100644 index 0000000..3e3b45f --- /dev/null +++ b/docs/libre-office/README.md @@ -0,0 +1,7 @@ +# About This Image + +This Image contains a browser-accessible version of [LibreOffice](https://www.libreoffice.org/). + +![Screenshot][Image_Screenshot] + +[Image_Screenshot]: https://5856039.fs1.hubspotusercontent-na1.net/hubfs/5856039/dockerhub/image-screenshots/libre-office.png "Image Screenshot" diff --git a/docs/libre-office/description.txt b/docs/libre-office/description.txt new file mode 100644 index 0000000..9e09617 --- /dev/null +++ b/docs/libre-office/description.txt @@ -0,0 +1 @@ +LibreOffice for Kasm Workspaces diff --git a/src/ubuntu/install/libre_office/custom_startup.sh b/src/ubuntu/install/libre_office/custom_startup.sh new file mode 100644 index 0000000..d8582d9 --- /dev/null +++ b/src/ubuntu/install/libre_office/custom_startup.sh @@ -0,0 +1,81 @@ +#!/usr/bin/env bash +set -ex +START_COMMAND="libreoffice" +PGREP="soffice.bin" +export MAXIMIZE="true" +export MAXIMIZE_NAME="LibreOffice" +MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh +DEFAULT_ARGS="" +ARGS=${APP_ARGS:-$DEFAULT_ARGS} + +options=$(getopt -o gau: -l go,assign,url: -n "$0" -- "$@") || exit +eval set -- "$options" + +while [[ $1 != -- ]]; do + case $1 in + -g|--go) GO='true'; shift 1;; + -a|--assign) ASSIGN='true'; shift 1;; + -u|--url) OPT_URL=$2; shift 2;; + *) echo "bad option: $1" >&2; exit 1;; + esac +done +shift + +# Process non-option arguments. +for arg; do + echo "arg! $arg" +done + +FORCE=$2 + +kasm_exec() { + if [ -n "$OPT_URL" ] ; then + URL=$OPT_URL + elif [ -n "$1" ] ; then + URL=$1 + fi + + # Since we are execing into a container that already has the browser running from startup, + # when we don't have a URL to open we want to do nothing. Otherwise a second browser instance would open. + if [ -n "$URL" ] ; then + /usr/bin/filter_ready + /usr/bin/desktop_ready + bash ${MAXIMIZE_SCRIPT} & + $START_COMMAND $ARGS $OPT_URL + else + echo "No URL specified for exec command. Doing nothing." + fi +} + +kasm_startup() { + if [ -n "$KASM_URL" ] ; then + URL=$KASM_URL + elif [ -z "$URL" ] ; then + URL=$LAUNCH_URL + fi + + if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then + + while true + do + if ! pgrep -x $PGREP > /dev/null + then + /usr/bin/filter_ready + /usr/bin/desktop_ready + set +e + bash ${MAXIMIZE_SCRIPT} & + $START_COMMAND $ARGS $URL + set -e + fi + sleep 1 + done + + fi + +} + +if [ -n "$GO" ] || [ -n "$ASSIGN" ] ; then + kasm_exec +else + kasm_startup +fi diff --git a/src/ubuntu/install/libre_office/install_libre_office.sh b/src/ubuntu/install/libre_office/install_libre_office.sh index b0be274..2fa09fe 100644 --- a/src/ubuntu/install/libre_office/install_libre_office.sh +++ b/src/ubuntu/install/libre_office/install_libre_office.sh @@ -1,13 +1,18 @@ #!/usr/bin/env bash -### every exit != 0 fails the script set -ex + apt-get update apt-get install -y software-properties-common -add-apt-repository -y ppa:libreoffice/ppa +add-apt-repository ppa:libreoffice/ppa apt-get update apt-get install -y libreoffice -add-apt-repository -r -y ppa:libreoffice/ppa -cp /usr/share/applications/libreoffice-startcenter.desktop $HOME/Desktop/ -chmod +x $HOME/Desktop/libreoffice-startcenter.desktop +rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* + +cp /usr/share/applications/libreoffice-startcenter.desktop $HOME/Desktop/ +chown 1000:1000 $HOME/Desktop/libreoffice-startcenter.desktop +chmod +x $HOME/Desktop/libreoffice-startcenter.desktop