Skip to content

Commit

Permalink
Improve build error detection
Browse files Browse the repository at this point in the history
  • Loading branch information
robballantyne committed Dec 12, 2023
1 parent 1de4d6f commit f733a17
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
env:
UBUNTU_VERSION: 22.04
BUILDX_NO_DEFAULT_ATTESTATIONS: 1
LATEST_CUDA: "2.1.1-py3.12-cuda-12.2.0-base-22.04"
LATEST_ROCM: "2.1.1-py3.12-rocm-5.6-runtime-22.04"
LATEST_CPU: "2.1.1-py3.12-cpu-22.04"
LATEST_CUDA: "2.1.1-py3.11-cuda-12.1.0-base-22.04"
LATEST_ROCM: "2.1.1-py3.11-rocm-5.6-runtime-22.04"
LATEST_CPU: "2.1.1-py3.11-cpu-22.04"

jobs:
cpu-base:
Expand All @@ -21,7 +21,6 @@ jobs:
python:
- "3.10"
- "3.11"
- "3.12"
pytorch:
- "2.0.1"
- "2.1.0"
Expand Down Expand Up @@ -82,7 +81,6 @@ jobs:
python:
- "3.10"
- "3.11"
- "3.12"
pytorch:
- "2.0.1"
- "2.1.0"
Expand All @@ -91,22 +89,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"
Expand Down Expand Up @@ -168,7 +161,6 @@ jobs:
python:
- "3.10"
- "3.11"
- "3.12"
pytorch:
- "2.0.1"
- "2.1.0"
Expand Down
3 changes: 3 additions & 0 deletions build/COPY_ROOT_EXTRA/opt/ai-dock/bin/build/layer1/init.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

# Override this file to add extras to your build
9 changes: 5 additions & 4 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ COPY ./COPY_ROOT/ /
# Use build scripts to ensure we can build all targets from one Dockerfile in a single layer.
# Don't put anything heavy in here - We can use multi-stage building above if necessary.

# Keep init.sh as-is and place additional logic in /opt/ai-dock/bin/preflight.sh
RUN /opt/ai-dock/bin/build/layer0/init.sh | tee /var/log/build.log
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
COPY ./COPY_ROOT_EXTRA/ /
# 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"]

0 comments on commit f733a17

Please sign in to comment.