From 90f6fb48b6847ff9982064f3c16c0d4805460193 Mon Sep 17 00:00:00 2001 From: Altan Orhon Date: Tue, 7 Nov 2023 23:43:42 -0800 Subject: [PATCH] Updated oras cache --- .build/README.j2.md | 4 ++-- hyakvnc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.build/README.j2.md b/.build/README.j2.md index aceece8..4334515 100644 --- a/.build/README.j2.md +++ b/.build/README.j2.md @@ -62,8 +62,8 @@ See https://hyak.uw.edu/docs/setup/intracluster-keys for more information. You'll need to find a HyakVNC-compatible container image to run your VNC session in. The following images are provided by us and can be used with `hyakvnc` by copying and pasting the URL into the `hyakvnc create` command: -- `oras://ghcr.io/maouw/hyakvnc_apptainer/ubuntu22.04_turbovnc:latest` -- Ubuntu 22.04 with TurboVNC -- `oras://ghcr.io/maouw/ubuntu22.04_freesurfer:latest` -- Ubuntu 22.04 with TurboVNC and Freesurfer +- `oras://ghcr.io/uw-psych/hyakvnc_apptainer/hyakvnc-vncserver-ubuntu22.04:latest` -- Ubuntu 22.04 with TurboVNC +- `oras://ghcr.io/uw-psych/hyakvnc_apptainer/hyakvnc-freesurfer-ubuntu22.04:latest` -- Ubuntu 22.04 with TurboVNC and Freesurfer ## Installing `hyakvnc` diff --git a/hyakvnc b/hyakvnc index 461abbd..a2a574b 100755 --- a/hyakvnc +++ b/hyakvnc @@ -70,7 +70,7 @@ HYAKVNC_DEFAULT_TIMEOUT="${HYAKVNC_DEFAULT_TIMEOUT:-30}" # %% Secon HYAKVNC_VNC_PASSWORD="${HYAKVNC_VNC_PASSWORD:-password}" # %% Password to use for new VNC sessions (default: `password`) HYAKVNC_VNC_DISPLAY="${HYAKVNC_VNC_DISPLAY:-:10}" # %% VNC display to use (default: `:1`) -HYAKVNC_MACOS_VNC_VIEWER_BUNDLEIDS="${HYAKVNC_MACOS_VNC_VIEWER_BUNDLEIDS:-com.turbovnc.vncviewer.VncViewer com.realvnc.vncviewer com.tigervnc.vncviewer}" # macOS bundle identifiers for VNC viewer executables (default: `com.turbovnc.vncviewer com.realvnc.vncviewer com.tigervnc.vncviewer`) +HYAKVNC_MACOS_VNC_VIEWER_BUNDLEIDS="${HYAKVNC_MACOS_VNC_VIEWER_BUNDLEIDS:-com.turbovnc.vncviewer.VncViewer com.turbovnc.vncviewer}" # macOS bundle identifiers for VNC viewer executables (default: `com.turbovnc.vncviewer com.realvnc.vncviewer com.tigervnc.vncviewer`) # ## Apptainer preferences: HYAKVNC_APPTAINER_CONTAINERS_DIR="${HYAKVNC_APPTAINER_CONTAINERS_DIR:-}" # %% Directory to look for apptainer containers (default: (none)) @@ -856,7 +856,7 @@ Examples: # Create a VNC session using the container ~/containers/mycontainer.sif hyakvnc create -c ~/containers/mycontainer.sif # Create a VNC session using the URL for a container: - hyakvnc create -c oras://ghcr.io/maouw/hyakvnc_apptainer/ubuntu22.04_turbovnc:latest + hyakvnc create -c oras://ghcr.io/uw-psych/hyakvnc_apptainer/hyakvnc-vncserver-ubuntu22.04:latest # Use the SLURM account escience, the partition gpu-a40, 4 CPUs, 1GB of memory, 1 GPU, and 1 hour of time: hyakvnc create -c ~/containers/mycontainer.sif -A escience -p gpu-a40 -C 4 -m 1G -t 1:00:00 -g 1