latest tag to 2.1.1, additional checks to ensure build quality

.github/workflows/docker-build.yml

@@ -8,13 +8,13 @@ on:
 env:
   UBUNTU_VERSION: 22.04
   BUILDX_NO_DEFAULT_ATTESTATIONS: 1
-  # Until py3.11 is available on all platforms
-  LATEST_CUDA: "pytorch-2.0.1-py3.10-cuda-11.8.0-base-22.04"
-  LATEST_CUDA_JUPYTER: "jupyter-pytorch-2.0.1-py3.10-cuda-11.8.0-base-22.04"
-  LATEST_ROCM: "pytorch-2.0.1-py3.10-rocm-5.4.2-runtime-22.04"
-  LATEST_ROCM_JUPYTER: "jupyter-pytorch-2.0.1-py3.10-rocm-5.4.2-runtime-22.04"
-  LATEST_CPU: "pytorch-2.0.1-py3.10-cpu-22.04"
-  LATEST_CPU_JUPYTER: "jupyter-pytorch-2.0.1-py3.10-cpu-22.04"
+  # Conservative defaults for cloud providers
+  LATEST_CUDA: "pytorch-2.1.1-py3.10-cuda-11.8.0-base-22.04"
+  LATEST_CUDA_JUPYTER: "jupyter-pytorch-2.1.1-py3.10-cuda-11.8.0-base-22.04"
+  LATEST_ROCM: "pytorch-2.1.1-py3.10-rocm-5.6-runtime-22.04"
+  LATEST_ROCM_JUPYTER: "jupyter-pytorch-2.1.1-py3.10-rocm-5.6-runtime-22.04"
+  LATEST_CPU: "pytorch-2.1.1-py3.10-cpu-22.04"
+  LATEST_CPU_JUPYTER: "jupyter-pytorch-2.1.1-py3.10-cpu-22.04"
 
 jobs:
   cpu-base:

README.md

@@ -62,23 +62,23 @@ Tags follow these patterns:
 ##### _CUDA_
 - `:pytorch-[pytorch-version]-py[python-version]-cuda-[x.x.x]-base-[ubuntu-version]`
 
-- `:latest-cuda` → `:pytorch-2.0.1-py3.10-cuda-11.8.0-base-22.04`
+- `:latest-cuda` → `:pytorch-2.1.1-py3.10-cuda-11.8.0-base-22.04`
 
-- `:latest-cuda-jupyter` → `:jupyter-pytorch-2.0.1-py3.10-cuda-11.8.0-base-22.04`
+- `:latest-cuda-jupyter` → `:jupyter-pytorch-2.1.1-py3.10-cuda-11.8.0-base-22.04`
 
 ##### _ROCm_
 - `:pytorch-[pytorch-version]-py[python-version]-rocm-[x.x.x]-runtime-[ubuntu-version]`
 
-- `:latest-rocm` → `:pytorch-2.0.1-py3.10-rocm-5.4.2-runtime-22.04`
+- `:latest-rocm` → `:pytorch-2.1.1-py3.10-rocm-5.6-runtime-22.04`
 
-- `:latest-rocm-jupyter` → `:jupyter-pytorch-2.0.1-py3.10-rocm-5.4.2-runtime-22.04`
+- `:latest-rocm-jupyter` → `:jupyter-pytorch-2.1.1-py3.10-rocm-5.6-runtime-22.04`
 
 ##### _CPU_
 - `:pytorch-[pytorch-version]-py[python-version]-ubuntu-[ubuntu-version]`
 
-- `:latest-cpu` → `:pytorch-2.0.1-py3.10-cpu-22.04` 
+- `:latest-cpu` → `:pytorch-2.1.1-py3.10-cpu-22.04` 
 
-- `:latest-cpu-jupyter` → `:jupyter-pytorch-2.0.1-py3.10-cpu-22.04` 
+- `:latest-cpu-jupyter` → `:jupyter-pytorch-2.1.1-py3.10-cpu-22.04` 
 
 Browse [here](https://github.com/ai-dock/comfyui/pkgs/container/comfyui) for an image suitable for your target environment.
 

build/COPY_ROOT/opt/ai-dock/bin/build/layer0/init.sh

@@ -16,4 +16,6 @@ else
     exit 1
 fi
 
+$MAMBA_DEFAULT_RUN python /opt/ai-dock/tests/assert-torch-version.py
+
 /opt/ai-dock/bin/build/layer0/clean.sh

build/COPY_ROOT_EXTRA/opt/ai-dock/bin/build/layer1/init.sh

@@ -76,6 +76,9 @@ function build_extra_start() {
         --port 11404 \
         --disable-auto-launch \
         --quick-test-for-ci
+
+    # Ensure pytorch hasn't been clobbered
+    $MAMBA_DEFAULT_RUN python /opt/ai-dock/tests/assert-torch-version.py
 }
 
 function build_extra_get_nodes() {

build/Dockerfile

@@ -18,15 +18,15 @@ COPY ./COPY_ROOT/ /
 # Don't put anything heavy in here - We can use multi-stage building above if necessary.
 
 ARG IMAGE_BASE
-RUN /opt/ai-dock/bin/build/layer0/init.sh
+RUN set -eo pipefail && /opt/ai-dock/bin/build/layer0/init.sh | tee /var/log/build.log
 
 ENV OPT_SYNC=ComfyUI:serverless
 ENV MAMBA_DEFAULT_ENV=comfyui
 ENV MAMBA_DEFAULT_RUN="micromamba run -n $MAMBA_DEFAULT_ENV"
 
 # Copy overrides and models into later layers for fast rebuilds
 COPY ./COPY_ROOT_EXTRA/ /
-RUN /opt/ai-dock/bin/build/layer1/init.sh
+RUN set -eo pipefail && /opt/ai-dock/bin/build/layer1/init.sh | tee -a /var/log/build.log
 
 # Keep init.sh as-is and place additional logic in /opt/ai-dock/bin/preflight.sh
 CMD ["init.sh"]

docker-compose.yaml

@@ -73,7 +73,7 @@ services:
         - DIRECT_ADDRESS=${DIRECT_ADDRESS:-127.0.0.1}
         - DIRECT_ADDRESS_GET_WAN=${DIRECT_ADDRESS_GET_WAN:-false}
         - WORKSPACE=${WORKSPACE:-/workspace}
-        - WORKSPACE_SYNC=${WORKSPACE_SYNC:-true}
+        - WORKSPACE_SYNC=${WORKSPACE_SYNC:-false}
         - CF_TUNNEL_TOKEN=${CF_TUNNEL_TOKEN:-}
         - CF_QUICK_TUNNELS=${CF_QUICK_TUNNELS:-true}
         - WEB_ENABLE_AUTH=${WEB_ENABLE_AUTH:-true}