From 5199f9511fbc66425289c9f9ba4ce122b113ef9d Mon Sep 17 00:00:00 2001
From: Seungmin Kim <8457324+ehfd@users.noreply.github.com>
Date: Sun, 7 Jul 2024 21:14:20 +0900
Subject: [PATCH] Revert Dockerfile

---
 Dockerfile |  4 ++--
 README.md  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 52b11c3..7961198 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -575,7 +575,7 @@ RUN KASMVNC_VERSION="$(curl -fsSL "https://api.github.com/repos/kasmtech/KasmVNC
 ENV PATH="${PATH:+${PATH}:}/usr/lib/rustdesk"
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}/usr/lib/rustdesk/lib"
 
-# Add custom packages right below this comment, or use FROM in a new container and replace entrypoint.sh or supervisord.conf, and set CMD to /usr/bin/supervisord
+# Add custom packages right below this comment, or use FROM in a new container and replace entrypoint.sh or supervisord.conf, and set ENTRYPOINT to /usr/bin/supervisord
 
 # Copy scripts and configurations used to start the container with `--chown=1000:1000`
 COPY --chown=1000:1000 entrypoint.sh /etc/entrypoint.sh
@@ -634,4 +634,4 @@ WORKDIR /home/ubuntu
 
 EXPOSE 8080
 
-CMD ["/usr/bin/supervisord"]
+ENTRYPOINT ["/usr/bin/supervisord"]
diff --git a/README.md b/README.md
index 7c071cc..8ae6abb 100644
--- a/README.md
+++ b/README.md
@@ -45,12 +45,12 @@ For [Apptainer](https://github.com/apptainer/apptainer)/[Singularity](https://gi
 
 ```bash
 # Customize paths
-export SINGULARITY_SELKIES_OVERLAY=~/my_mounting_point/nvidia-egl-desktop.sif
-export SINGULARITY_SELKIES_SCRATCH_HOME=~/nvidia-egl-desktop
-mkdir -pm755 "${SINGULARITY_SELKIES_SCRATCH_HOME}"
+export APPTAINER_SELKIES_OVERLAY=~/my_mounting_point/nvidia-egl-desktop.sif
+export APPTAINER_SELKIES_SCRATCH_HOME=~/nvidia-egl-desktop
+mkdir -pm755 "${APPTAINER_SELKIES_SCRATCH_HOME}"
 # Change size of overlay storage
-singularity overlay create --sparse --size 1536 "${SINGULARITY_SELKIES_OVERLAY}"
-singularity instance start --overlay "${SINGULARITY_SELKIES_OVERLAY}" --nv --no-mount cwd --home "${SINGULARITY_SELKIES_SCRATCH_HOME}:/home/ubuntu" --env "TZ=UTC,DISPLAY_SIZEW=1920,DISPLAY_SIZEH=1080,DISPLAY_REFRESH=60,DISPLAY_DPI=96,DISPLAY_CDEPTH=24,PASSWD=mypasswd,SELKIES_ENCODER=nvh264enc,SELKIES_VIDEO_BITRATE=8000,SELKIES_FRAMERATE=60,SELKIES_AUDIO_BITRATE=128000,SELKIES_BASIC_AUTH_PASSWORD=mypasswd" docker://ghcr.io/selkies-project/nvidia-egl-desktop:latest egl
+apptainer overlay create --sparse --size 1536 "${APPTAINER_SELKIES_OVERLAY}"
+apptainer instance run --overlay "${APPTAINER_SELKIES_OVERLAY}" --nv --no-mount cwd --home "${APPTAINER_SELKIES_SCRATCH_HOME}:/home/ubuntu" --env "TZ=UTC,DISPLAY_SIZEW=1920,DISPLAY_SIZEH=1080,DISPLAY_REFRESH=60,DISPLAY_DPI=96,DISPLAY_CDEPTH=24,PASSWD=mypasswd,SELKIES_ENCODER=nvh264enc,SELKIES_VIDEO_BITRATE=8000,SELKIES_FRAMERATE=60,SELKIES_AUDIO_BITRATE=128000,SELKIES_BASIC_AUTH_PASSWORD=mypasswd" docker://ghcr.io/selkies-project/nvidia-egl-desktop:latest egl
 ```
 
 The environment variable `VGL_DISPLAY` can also be passed to the container, but only do so after you understand what it implicates with VirtualGL, valid values being either `egl[n]`, or `/dev/dri/card[n]` only when `--device=/dev/dri:rwm` was used for the container.