Improve build error detection

ai-dock · Dec 12, 2023 · fd8d7e4 · fd8d7e4
1 parent b0c3d0b
commit fd8d7e4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -21,7 +21,6 @@ jobs:
         python:
           - "3.10"
           - "3.11"
-          - "3.12"
         pytorch:
           - "2.0.1"
           - "2.1.0"
@@ -83,7 +82,6 @@ jobs:
         python:
           - "3.10"
           - "3.11"
-          - "3.12"
         pytorch:
           - "2.0.1"
           - "2.1.0"
@@ -92,22 +90,17 @@ jobs:
           - "11.7.1"
           - "11.8.0"
           - "12.1.0"
-          - "12.2.0"
         level:
           - "base"
           - "devel"
           - "cudnn8-devel"
         exclude:
           - pytorch: "2.0.1"
             cuda: "12.1.0"
-          - pytorch: "2.0.1"
-            cuda: "12.2.0"
           - pytorch: "2.1.0"
             cuda: "11.7.1"
           - pytorch: "2.1.1"
             cuda: "11.7.1"
-          - cuda: "12.2.0"
-            level: "cudnn8-devel"
           - cuda: "12.1.0"
             level: "devel"
           - cuda: "11.8.0"
@@ -171,7 +164,6 @@ jobs:
         python:
           - "3.10"
           - "3.11"
-          - "3.12"
         pytorch:
           - "2.0.1"
           - "2.1.0"

diff --git a/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/init.sh b/build/COPY_ROOT/opt/ai-dock/bin/build/layer0/init.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Must exit and fail to build if any command fails
-set -e
+set -eo pipefail
 
 /opt/ai-dock/bin/build/layer0/common.sh
 

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -22,10 +22,12 @@ COPY ./COPY_ROOT/ /
 # Don't put anything heavy in here - We can use multi-stage building above if necessary.
 ARG PYTORCH_VERSION
 ENV PYTORCH_VERSION=${PYTORCH_VERSION}
-RUN /opt/ai-dock/bin/build/layer0/init.sh | tee /var/log/build.log
 
-# Copy overrides and new files into a final layer for fast rebuilds
-COPY ./COPY_ROOT_EXTRA/ /
+RUN set -eo pipefail && /opt/ai-dock/bin/build/layer0/init.sh | tee /var/log/build.log
+
+# Copy overrides and new files into a final layer for fast rebuilds. Uncomment below
+#COPY ./COPY_ROOT_EXTRA/ /
+#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"]