Skip to content

Commit f1142ba

Browse files
robballantynerobballantyne
committed
Drop unsupported links and disable autobuild on push
1 parent 3dd7c90 commit f1142ba

File tree

2 files changed

+32
-120
lines changed

2 files changed

+32
-120
lines changed

‎.github/workflows/docker-build.yml

+31-114
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88
env:
99
UBUNTU_VERSION: 22.04
1010
BUILDX_NO_DEFAULT_ATTESTATIONS: 1
11-
LATEST_CUDA: "cuda-11.8.0-runtime-22.04"
12-
LATEST_ROCM: "rocm-5.6-runtime-22.04"
13-
LATEST_CPU: "cpu-22.04"
1411

1512
jobs:
1613
cpu-base:
1714
runs-on: ubuntu-latest
1815
strategy:
1916
fail-fast: false
17+
matrix:
18+
build:
19+
- {latest: "false", selkies: "1.6.1"}
2020
steps:
2121
-
2222
name: Free Space
@@ -51,21 +51,22 @@ jobs:
5151
name: Set tags
5252
run: |
5353
img_path="ghcr.io/${{ env.PACKAGE_NAME }}"
54-
ver_tag="cpu-${{ env.UBUNTU_VERSION }}"
54+
ver_tag="v2-cpu-${{ env.UBUNTU_VERSION }}"
5555
56-
if [[ $ver_tag == ${{ env.LATEST_CPU }} ]]; then
57-
TAGS="${img_path}:latest-cpu, ${img_path}:$ver_tag"
58-
else
59-
TAGS="${img_path}:$ver_tag"
60-
fi
56+
if [[ ${{ matrix.build.latest }} == "true" ]]; then
57+
echo "Marking latest"
58+
TAGS="${img_path}:${base_tag}, ${img_path}:latest-cpu"
59+
else
60+
TAGS="${img_path}:${base_tag}"
61+
fi
6162
echo "TAGS=${TAGS}" >> ${GITHUB_ENV}
6263
-
6364
name: Build and push
6465
uses: docker/build-push-action@v4
6566
with:
6667
context: build
6768
build-args: |
68-
IMAGE_BASE=ghcr.io/ai-dock/base-image:cpu-${{ env.UBUNTU_VERSION }}
69+
IMAGE_BASE=ghcr.io/ai-dock/base-image:v2-cpu-${{ env.UBUNTU_VERSION }}
6970
push: true
7071
# Avoids unknown/unknown architecture and extra metadata
7172
provenance: false
@@ -76,90 +77,8 @@ jobs:
7677
strategy:
7778
fail-fast: false
7879
matrix:
79-
cuda:
80-
- 11.8.0
81-
- 12.1.0
82-
- 12.2.0
83-
- 12.3.1
84-
level:
85-
- "base"
86-
- "runtime"
87-
- "devel"
88-
steps:
89-
-
90-
name: Free Space
91-
run: |
92-
df -h
93-
rm -rf /usr/share/dotnet
94-
rm -rf /opt/ghc
95-
rm -rf /usr/local/share/boost
96-
rm -rf "$AGENT_TOOLSDIRECTORY"
97-
df -h
98-
-
99-
name: Env Setter
100-
run: |
101-
echo "PACKAGE_NAME=${GITHUB_REPOSITORY,,}" >> ${GITHUB_ENV}
102-
-
103-
name: Checkout
104-
uses: actions/checkout@v3
105-
-
106-
name: Permissions fixes
107-
run: |
108-
reponame="$(basename ${GITHUB_REPOSITORY})"
109-
target="${HOME}/work/${reponame}/${reponame}/build/COPY*"
110-
chmod -R ug+rwX ${target}
111-
-
112-
name: Login to GitHub Container Registry
113-
uses: docker/login-action@v2
114-
with:
115-
registry: ghcr.io
116-
username: ${{ github.actor }}
117-
password: ${{ secrets.GITHUB_TOKEN }}
118-
-
119-
name: Set tags
120-
run: |
121-
img_path="ghcr.io/${{ env.PACKAGE_NAME }}"
122-
ver_tag="cuda-${{ matrix.cuda }}-${{ matrix.level }}-${{ env.UBUNTU_VERSION }}"
123-
124-
if [[ $ver_tag == ${{ env.LATEST_CUDA }} ]]; then
125-
TAGS="${img_path}:latest, ${img_path}:latest-cuda, ${img_path}:$ver_tag"
126-
else
127-
TAGS="${img_path}:$ver_tag"
128-
fi
129-
echo "TAGS=${TAGS}" >> ${GITHUB_ENV}
130-
-
131-
name: Build and push
132-
uses: docker/build-push-action@v4
133-
with:
134-
context: build
135-
build-args: |
136-
IMAGE_BASE=ghcr.io/ai-dock/base-image:cuda-${{ matrix.cuda }}-${{ matrix.level }}-${{ env.UBUNTU_VERSION }}
137-
push: true
138-
provenance: false
139-
tags: ${{ env.TAGS }}
140-
141-
nvidia-base-pytorch:
142-
runs-on: ubuntu-latest
143-
strategy:
144-
fail-fast: false
145-
matrix:
146-
cuda:
147-
- 11.8.0
148-
- 12.1.0
149-
level:
150-
- "runtime"
151-
- "devel"
152-
python:
153-
- "3.10"
154-
- "3.11"
155-
- "3.12"
156-
pytorch:
157-
- "2.1.2"
158-
- "2.2.0"
159-
- "2.2.1"
160-
exclude:
161-
- python: "3.12"
162-
pytorch: "2.1.2"
80+
build:
81+
- {latest: "false", selkies: "1.6.1", cuda: "12.1.1-cudnn8-runtime"}
16382
steps:
16483
-
16584
name: Free Space
@@ -194,21 +113,22 @@ jobs:
194113
name: Set tags
195114
run: |
196115
img_path="ghcr.io/${{ env.PACKAGE_NAME }}"
197-
ver_tag="pytorch-${{ matrix.pytorch }}-py${{ matrix.python }}-cuda-${{ matrix.cuda }}-${{ matrix.level }}-${{ env.UBUNTU_VERSION }}"
116+
ver_tag="v2-cuda-${{ matrix.build.cuda }}-${{ env.UBUNTU_VERSION }}"
198117
199-
if [[ $ver_tag == ${{ env.LATEST_CUDA }} ]]; then
200-
TAGS="${img_path}:latest, ${img_path}:latest-cuda, ${img_path}:$ver_tag"
201-
else
202-
TAGS="${img_path}:$ver_tag"
203-
fi
118+
if [[ ${{ matrix.build.latest }} == "true" ]]; then
119+
echo "Marking latest"
120+
TAGS="${img_path}:${base_tag}, ${img_path}:latest, ${img_path}:latest-cuda"
121+
else
122+
TAGS="${img_path}:${base_tag}"
123+
fi
204124
echo "TAGS=${TAGS}" >> ${GITHUB_ENV}
205125
-
206126
name: Build and push
207127
uses: docker/build-push-action@v4
208128
with:
209129
context: build
210130
build-args: |
211-
IMAGE_BASE=ghcr.io/ai-dock/jupyter-pytorch:${{ matrix.pytorch }}-py${{ matrix.python }}-cuda-${{ matrix.cuda }}-${{ matrix.level }}-${{ env.UBUNTU_VERSION }}
131+
IMAGE_BASE=ghcr.io/ai-dock/base-image:v2-cuda-${{ matrix.build.cuda }}-${{ env.UBUNTU_VERSION }}
212132
push: true
213133
provenance: false
214134
tags: ${{ env.TAGS }}
@@ -218,12 +138,8 @@ jobs:
218138
strategy:
219139
fail-fast: false
220140
matrix:
221-
rocm:
222-
- 5.7
223-
- 5.6
224-
level:
225-
- "core"
226-
- "runtime"
141+
build:
142+
- {latest: "false", selkies: "1.6.1", rocm: "6.0-runtime"}
227143
steps:
228144
-
229145
name: Free Space
@@ -258,21 +174,22 @@ jobs:
258174
name: Set tags
259175
run: |
260176
img_path="ghcr.io/${{ env.PACKAGE_NAME }}"
261-
ver_tag="rocm-${{ matrix.rocm }}-${{ matrix.level }}-${{ env.UBUNTU_VERSION }}"
177+
ver_tag="v2-rocm-${{ matrix.build.rocm }}-${{ env.UBUNTU_VERSION }}"
262178
263-
if [[ $ver_tag == ${{ env.LATEST_ROCM }} ]]; then
264-
TAGS="${img_path}:latest-rocm, ${img_path}:$ver_tag"
265-
else
266-
TAGS="${img_path}:$ver_tag"
267-
fi
179+
if [[ ${{ matrix.build.latest }} == "true" ]]; then
180+
echo "Marking latest"
181+
TAGS="${img_path}:${base_tag}, ${img_path}:latest-rocm"
182+
else
183+
TAGS="${img_path}:${base_tag}"
184+
fi
268185
echo "TAGS=${TAGS}" >> ${GITHUB_ENV}
269186
-
270187
name: Build and push
271188
uses: docker/build-push-action@v4
272189
with:
273190
context: build
274191
build-args: |
275-
IMAGE_BASE=ghcr.io/ai-dock/base-image:rocm-${{ matrix.rocm }}-${{ matrix.level }}-${{ env.UBUNTU_VERSION }}
192+
IMAGE_BASE=ghcr.io/ai-dock/base-image:v2-rocm-${{ matrix.build.rocm }}-${{ env.UBUNTU_VERSION }}
276193
push: true
277194
provenance: false
278195
tags: ${{ env.TAGS }}

‎README.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Run a hardware accelerated KDE desktop in a container. This image is heavily inf
77

88
## Documentation
99

10-
All AI-Dock containers share a common base which is designed to make running on cloud services such as [vast.ai](https://link.ai-dock.org/vast.ai) and [runpod.io](https://link.ai-dock.org/template) as straightforward and user friendly as possible.
10+
All AI-Dock containers share a common base which is designed to make running on cloud services such as [vast.ai](https://link.ai-dock.org/vast.ai) as straightforward and user friendly as possible.
1111

1212
Common features and options are documented in the [base wiki](https://github.com/ai-dock/base-image/wiki) but any additional features unique to this image will be detailed below.
1313

@@ -48,11 +48,6 @@ Supported Platforms: `NVIDIA CUDA`, `AMD ROCm`, `CPU/iGPU`
4848

4949
[linux-desktop:latest](https://link.ai-dock.org/template-vast-linux-desktop)
5050

51-
---
52-
53-
**Runpod.​io**
54-
55-
[linux-desktop:latest](https://link.ai-dock.org/template-runpod-linux-desktop)
5651

5752
---
5853

0 commit comments

Comments
 (0)