fix: patch vnc files

Makefile

@@ -16,7 +16,7 @@ base-notebook : base-image
 	conda-lock lock  -f environment.yml -p linux-64; \
 	conda-lock render -k explicit -p linux-64; \
 	../generate-packages-list.py conda-linux-64.lock > packages.txt; \
-	docker build -t datalabs/base-notebook:master . --progress=plain --platform linux/amd64; \
+	docker build -t datalabs/base-notebook:master . --no-cache --progress=plain --platform linux/amd64; \
 	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) datalabs/base-notebook:master ./run_tests.sh base-notebook
 
 .PHONY: pangeo-notebook

base-image/Dockerfile

@@ -194,17 +194,6 @@ ONBUILD RUN for script in $(find "resources" -type f -name "install.sh"); do \
         layer-cleanup.sh; \
     done
 
-# ONBUILD RUN echo "Checking for 'resources/install.sh'..."  && \
-#         if ls resources/install-*.sh 1> /dev/null 2>&1; then \
-#             for file in resources/**/install.sh; do \
-#                 echo "Executing $file" && \
-#                 chmod +x "$file" && \
-#                 bash "$file" && \
-#                 layer-cleanup.sh \
-#                 rm -f "$file"; \
-#             done \
-#         fi
-
 # If a postBuild file exists, run it!
 # After it's done, we try to remove any possible cruft commands there
 # leave behind under $HOME - particularly stuff that jupyterlab extensions

base-notebook/Dockerfile

@@ -3,4 +3,4 @@
 # files (such as conda-linux-64.lock, start) in this repo.
 # Refer to the base-image/Dockerfile for documentation.
 ARG PANGEO_BASE_IMAGE_TAG=master
-FROM pangeo/base-image:${PANGEO_BASE_IMAGE_TAG}
+FROM datalabs/base-image:${PANGEO_BASE_IMAGE_TAG}

base-notebook/resources/vnc/install.sh

@@ -44,7 +44,7 @@ rm ./turbovnc_3.1_amd64.deb
 ln -s /opt/TurboVNC/bin/* /usr/local/bin/
 mamba install --quiet websockify
 cp resources/branding/desktop/wallpaper.png /opt/vre/wallpaper.png
-cp -r resources/branding/desktop/xfce-perchannel-xml /etc/xdg/xfce4/xfconf/xfce-perchannel-xml
+cp -r resources/branding/desktop/xfce-perchannel-xml /etc/xdg/xfce4/xfconf/
 # Fix missing rebind.so issue
 cd /opt && git clone --quiet https://github.com/novnc/websockify.git
 cd /opt/websockify && make && cp rebind.so /usr/local/bin