Skip to content

Commit 20af243

Browse files
authored
Merge pull request #7 from discoverygarden/IT-685
IT-685: Getting rid of kasmvnc
2 parents 94bbc0d + 981944a commit 20af243

File tree

8 files changed

+0
-475
lines changed

8 files changed

+0
-475
lines changed

config.playwright.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,8 @@ web_environment:
2121
- DGI_PLAYWRIGHT_TESTS_DIR=$DDEV_COMPOSER_ROOT/test/playwright-tests
2222
- DGI_PLAYWRIGHT_TEST_URL=$DDEV_PRIMARY_URL
2323
# We add the sleep so this doesn't error out when not using playwright.
24-
web_extra_daemons:
25-
- name: "kasmvnc"
26-
command: "kasmvncserver -fg || sleep infinity"
27-
directory: /var/www/html
2824
web_extra_exposed_ports:
2925
- name: playwright
3026
container_port: 9323
3127
http_port: 8323
3228
https_port: 9324
33-
- name: kasmvnc
34-
container_port: 8444
35-
http_port: 8443
36-
https_port: 8444

install.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ project_files:
6262
- commands/web/playwright
6363
- web-build/.gitignore
6464
- web-build/disabled.Dockerfile.playwright
65-
- web-build/Dockerfile.task
66-
- web-build/install-task.sh
67-
- web-build/install-kasmvnc.sh
68-
- web-build/kasmvnc.yaml
69-
- web-build/xstartup
7065
- config.playwright.yml
7166

7267
# List of files and directories that are copied into the global .ddev directory

web-build/Dockerfile.task

Lines changed: 0 additions & 4 deletions
This file was deleted.

web-build/disabled.Dockerfile.playwright

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,5 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
6161
sudo apt-get install -y icewm \
6262
xauth
6363

64-
# Install kasmvnc for remote access.
65-
COPY install-kasmvnc.sh /usr/local/bin
66-
RUN chmod +x /usr/local/bin/install-kasmvnc.sh
67-
68-
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
69-
--mount=type=cache,target=/var/lib/apt,sharing=locked \
70-
install-kasmvnc.sh
71-
72-
# We can't add the user to the ssl-cert group. Rather, we can add them, but it
73-
# won't actually apply to ddev ssh / docker exec.
74-
# Even though we disable requiring SSL because we route through the ddev
75-
# router, kasmvnc still requires reading the TLS cert.
76-
RUN sudo chgrp -R $gid /etc/ssl/private
77-
78-
RUN sudo -u $username mkdir /home/$username/.vnc
79-
COPY kasmvnc.yaml xstartup /home/$username/.vnc
80-
RUN chown $username:$username /home/$username/.vnc/*
81-
RUN sudo -u $username touch /home/$username/.vnc/.de-was-selected
82-
83-
RUN sudo -u $username /bin/bash -c 'echo -e "secret\nsecret\n" | kasmvncpasswd -wo -u $USER'
84-
8564
# We're done with apt so disable caching again for the final image.
8665
RUN mv /etc/apt/docker-clean-disabled /etc/apt/apt.conf.d/docker-clean

web-build/install-kasmvnc.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)