diff --git a/plasma/.env b/plasma/.env index d8b5a05..9ec60fd 100644 --- a/plasma/.env +++ b/plasma/.env @@ -1,5 +1,6 @@ # .env for myvnc KDE plasma webtop -MYVNC_KDEPLASMA_VNCPASS= MYVNC_KDEPLASMA_PORT= +MYVNC_KDEPLASMA_VNCPASS= + MYVNC_KDEPLASMA_CUSTOM_TITLE= -MYVNC_KDEPLASMA_PROXYPATH= \ No newline at end of file +MYVNC_KDEPLASMA_PROXYPATH= diff --git a/plasma/build b/plasma/build index 177c3a7..a3fd2fb 100755 --- a/plasma/build +++ b/plasma/build @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Docker build # Optional: buildtag -DOCKER_BUILDKIT=1 \ -docker build . \ - --tag ${buildtag:-myvnc/webtop:plasma} +# DOCKER_BUILDKIT=1 \ +# docker build . \ +# --tag ${buildtag:-myvnc/webtop:plasma} +docker compose up --build --detach diff --git a/plasma/docker-compose.yaml b/plasma/docker-compose.yaml index b664f92..fea5de9 100644 --- a/plasma/docker-compose.yaml +++ b/plasma/docker-compose.yaml @@ -3,6 +3,8 @@ services: image: myvnc/webtop:plasma container_name: kdeplasma restart: unless-stopped + build: + context: . environment: MYVNC_VNCPASS: ${MYVNC_KDEPLASMA_VNCPASS} networks: @@ -26,12 +28,13 @@ services: environment: MYVNC_CUSTOM_TITLE: ${MYVNC_KDEPLASMA_CUSTOM_TITLE} MYVNC_PROXYPATH: ${MYVNC_KDEPLASMA_PROXYPATH} + MYVNC_VNCSHARING: false + MYVNC_VNCLISTEN_HOST: kdeplasma MYVNC_VNCLISTEN_PORT: 5900 - MYVNC_VNCSHARING: false networks: - kdeplasma networks: kdeplasma: - external: false \ No newline at end of file + external: false diff --git a/plasma/entrypoint b/plasma/entrypoint index a7ff743..e3c837a 100755 --- a/plasma/entrypoint +++ b/plasma/entrypoint @@ -1,6 +1,7 @@ #!/usr/bin/env bash # Create required home directories [ -d ~/.vnc ] || mkdir -p ~/.vnc +[ -d ~/.ssh ] || mkdir -p ~/.ssh [ -d ~/.config ] || mkdir -p ~/.config # Check for MYVNC_VNCPASS variable @@ -39,7 +40,6 @@ fi # VNC config cat >~/.vnc/config <<- vncconfig session=plasmax11 -dpi=192 geometry=1920x1080 framerate=60 depth=32 @@ -55,4 +55,4 @@ Timeout=0 kscreenlockerrc # Launch Tigervnc -/usr/bin/dbus-launch vncserver :0 \ No newline at end of file +/usr/bin/dbus-launch vncserver :0