diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 3154bea..70ee77e 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,8 +48,12 @@ jobs: | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/blobs/${digest}" \ - | jq -r '.container_config') + "https://ghcr.io/v2/${image}/blobs/${digest}") + if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then + image_info=$(echo $image_info | jq -r '.config') + else + image_info=$(echo $image_info | jq -r '.container_config') + fi IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then diff --git a/Dockerfile b/Dockerfile index 176b135..a279b9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,7 +65,7 @@ RUN \ fi && \ curl -o \ /tmp/wizard.tar.gz -L \ - "https://github.com/kasmtech/kasm-install-wizard/tarball/feature/KASM-3512-gpu-option" && \ + "https://github.com/kasmtech/kasm-install-wizard/archive/refs/tags/${KASM_VERSION}.tar.gz" && \ tar xf \ /tmp/wizard.tar.gz -C \ /wizard --strip-components=1 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ae310b8..49c4fed 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -65,7 +65,7 @@ RUN \ fi && \ curl -o \ /tmp/wizard.tar.gz -L \ - "https://github.com/kasmtech/kasm-install-wizard/tarball/feature/KASM-3512-gpu-option" && \ + "https://github.com/kasmtech/kasm-install-wizard/archive/refs/tags/${KASM_VERSION}.tar.gz" && \ tar xf \ /tmp/wizard.tar.gz -C \ /wizard --strip-components=1 && \ diff --git a/README.md b/README.md index 82d090f..d5653ac 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ Currently Synology systems are not supported due to them blocking CPU scheduling ### GPU Support -During installation an option will be presented to force all Workspace containers to mount in and use a specific GPU. This option is meant for non NVIDIA GPUs only, if using an NVIDIA card please use the native support built into Kasm Workspaces and ensure you are running this container with the NVIDIA container runtime. +During installation an option will be presented to force all Workspace containers to mount in and use a specific GPU. If using an NVIDIA GPU you will need to pass `-e NVIDIA_VISIBLE_DEVICES=all` or `--gpus all` and have the [NVIDIA Container Runtime](https://github.com/NVIDIA/nvidia-container-runtime) installed on the host. Also if using NVIDIA, Kasm Workspaces has [native NVIDIA support](https://www.kasmweb.com/docs/latest/how_to/gpu.html) so you can optionally opt to simply use that instead of he manual override during installation. ### Gamepad support diff --git a/readme-vars.yml b/readme-vars.yml index 96ec0cd..2e179c8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -89,7 +89,7 @@ app_setup_block: | ### GPU Support - During installation an option will be presented to force all Workspace containers to mount in and use a specific GPU. This option is meant for non NVIDIA GPUs only, if using an NVIDIA card please use the native support built into Kasm Workspaces and ensure you are running this container with the NVIDIA container runtime. + During installation an option will be presented to force all Workspace containers to mount in and use a specific GPU. If using an NVIDIA GPU you will need to pass `-e NVIDIA_VISIBLE_DEVICES=all` or `--gpus all` and have the [NVIDIA Container Runtime](https://github.com/NVIDIA/nvidia-container-runtime) installed on the host. Also if using NVIDIA, Kasm Workspaces has [native NVIDIA support](https://www.kasmweb.com/docs/latest/how_to/gpu.html) so you can optionally opt to simply use that instead of he manual override during installation. ### Gamepad support