mirror of
https://github.com/kasmtech/workspaces-images.git
synced 2025-02-16 09:51:14 +01:00
KASM-2193 Updated vncviewer image to focal
This image got missed when I merged develop into my branch before submitting the merge request.
This commit is contained in:
parent
e03153a3c9
commit
64d67d163d
@ -1,5 +1,6 @@
|
|||||||
ARG BASE_TAG="develop"
|
ARG BASE_TAG="develop"
|
||||||
FROM kasmweb/core-ubuntu-bionic:$BASE_TAG
|
ARG BASE_IMAGE="core-ubuntu-focal"
|
||||||
|
FROM kasmweb/$BASE_IMAGE:$BASE_TAG
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
ENV HOME /home/kasm-default-profile
|
ENV HOME /home/kasm-default-profile
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
set -ex
|
set -ex
|
||||||
START_COMMAND="/usr/bin/vncviewer"
|
START_COMMAND="/usr/bin/vncviewer"
|
||||||
PGREP="vncviewer"
|
PGREP="vncviewer"
|
||||||
MAXIMUS="false"
|
export MAXIMIZE="false"
|
||||||
|
MAXIMIZE_SCRIPT=$STARTUPDIR/maximize_window.sh
|
||||||
DEFAULT_ARGS=""
|
DEFAULT_ARGS=""
|
||||||
ARGS=${APP_ARGS:-$DEFAULT_ARGS}
|
ARGS=${APP_ARGS:-$DEFAULT_ARGS}
|
||||||
|
|
||||||
@ -38,6 +39,7 @@ kasm_exec() {
|
|||||||
if [ -n "$URL" ] ; then
|
if [ -n "$URL" ] ; then
|
||||||
/usr/bin/filter_ready
|
/usr/bin/filter_ready
|
||||||
/usr/bin/desktop_ready
|
/usr/bin/desktop_ready
|
||||||
|
bash ${MAXIMIZE_SCRIPT} &
|
||||||
$START_COMMAND $ARGS $OPT_URL
|
$START_COMMAND $ARGS $OPT_URL
|
||||||
else
|
else
|
||||||
echo "No URL specified for exec command. Doing nothing."
|
echo "No URL specified for exec command. Doing nothing."
|
||||||
@ -53,10 +55,6 @@ kasm_startup() {
|
|||||||
|
|
||||||
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
|
if [ -z "$DISABLE_CUSTOM_STARTUP" ] || [ -n "$FORCE" ] ; then
|
||||||
|
|
||||||
if [[ $MAXIMUS == 'true' ]] ; then
|
|
||||||
maximus &
|
|
||||||
fi
|
|
||||||
|
|
||||||
while true
|
while true
|
||||||
do
|
do
|
||||||
if ! pgrep -x $PGREP > /dev/null
|
if ! pgrep -x $PGREP > /dev/null
|
||||||
@ -64,6 +62,7 @@ kasm_startup() {
|
|||||||
/usr/bin/filter_ready
|
/usr/bin/filter_ready
|
||||||
/usr/bin/desktop_ready
|
/usr/bin/desktop_ready
|
||||||
set +e
|
set +e
|
||||||
|
bash ${MAXIMIZE_SCRIPT} &
|
||||||
$START_COMMAND $ARGS $URL
|
$START_COMMAND $ARGS $URL
|
||||||
set -e
|
set -e
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user