From e6f715ef2fce4d9c5dcba5f785eb81d083d330bf Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik@sundellopensource.se>
Date: Fri, 29 Mar 2024 22:38:48 +0100
Subject: [PATCH] cleanup

---
 .github/workflows/test.yaml | 7 +++++++
 Dockerfile                  | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index e1f325ca..5bce24a3 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -54,6 +54,13 @@ jobs:
           container_id=$(docker run -d -it -p 5901:5901 test vncserver -xstartup /opt/install/jupyter_remote_desktop_proxy/share/xstartup -verbose -fg -geometry 1680x1050 -SecurityTypes None -rfbport 5901)
           sleep 1
 
+          echo "::group::Install netcat, a test dependency"
+          docker exec --user root $container_id bash -c '
+              apt update
+              apt install -y netcat
+          '
+          echo "::endgroup::"
+
           docker exec -it $container_id timeout --preserve-status 1 nc -v localhost 5901 2>&1 | tee -a /dev/stderr | \
               grep --quiet RFB && echo "Passed test" || { echo "Failed test" && TEST_OK=false; }
 
diff --git a/Dockerfile b/Dockerfile
index 80ffb137..934ab11b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,6 @@ RUN apt-get -y -qq update \
         xorg \
         xubuntu-icon-theme \
         fonts-dejavu \
-        netcat \
-        net-tools \
     # Disable the automatic screenlock since the account password is unknown
  && apt-get -y -qq remove xfce4-screensaver \
     # chown $HOME to workaround that the xorg installation creates a
@@ -58,5 +56,4 @@ RUN . /opt/conda/bin/activate && \
 COPY --chown=$NB_UID:$NB_GID . /opt/install
 RUN . /opt/conda/bin/activate && \
     pip install -e /opt/install && \
-    pip install https://github.com/jupyterhub/jupyter-server-proxy/archive/main.zip && \
     jupyter server extension enable jupyter_remote_desktop_proxy