Skip to content

feat: Add multi-arch support, update run-image, and streamline build process #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
+273 −69
Draft

feat: Add multi-arch support, update run-image, and streamline build process #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8dd6821
chore: update ubuntu to noble
SalimKayal Oct 9, 2025
35b3d58
chore: move tini from buildpacks to run-image
SalimKayal Oct 9, 2025
312bc8a
chore: update versions
SalimKayal Oct 9, 2025
c2370e7
feat: add arm64 targets
SalimKayal Oct 9, 2025
7e52dca
feat: publish multi-arch images in actions
SalimKayal Oct 10, 2025
15fc6aa
squashme: vscodium buildpack version fix
SalimKayal Oct 10, 2025
0111fde
revert: back to jammy
SalimKayal Oct 29, 2025
f0d0556
chore: update versions
SalimKayal Oct 29, 2025
e1653cb
Merge branch 'main' into feat/multi-arch
SalimKayal Oct 31, 2025
b015408
Feat: Enable CUDA-enabled images and multi-arch builds (#106)
SalimKayal Nov 11, 2025
4c999a3
Chore: Update OS (#107)
SalimKayal Nov 11, 2025
ddedfe9
fix: add AS base
SalimKayal Nov 14, 2025
6ac6739
fix: capitalization
SalimKayal Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions .github/workflows/update-versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: |
echo "REPO=${GITHUB_REPOSITORY@L}" >> "${GITHUB_OUTPUT}"

build-and-push-run-image:
build-and-push-build-run-images:
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
needs: validate-tag
Expand Down Expand Up @@ -66,15 +66,46 @@ jobs:
with:
context: ./run-image
file: ./run-image/Dockerfile
platforms: linux/amd64,linux/arm64
target: run
push: true
tags: ghcr.io/${{ needs.validate-tag.outputs.repo_lower }}/base-image:${{ github.event.inputs.version }}
labels: io.buildpacks.base.distro.name=ubuntu,io.buildpacks.base.distro.version=24.04
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build and push cuda run-image
uses: docker/build-push-action@v5
with:
context: ./run-image
file: ./run-image/Dockerfile
platforms: linux/amd64,linux/arm64
build-args: base_image=nvcr.io/nvidia/cuda-dl-base:25.10-cuda13.0-devel-ubuntu24.04
target: run
push: true
tags: ghcr.io/${{ needs.validate-tag.outputs.repo_lower }}/run-cuda-image:${{ github.event.inputs.version }}
labels: io.buildpacks.base.distro.name=ubuntu,io.buildpacks.base.distro.version=24.04
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Build and push cuda build-image
uses: docker/build-push-action@v5
with:
context: ./run-image
file: ./run-image/Dockerfile
platforms: linux/amd64,linux/arm64
build-args: base_image=nvcr.io/nvidia/cuda-dl-base:25.10-cuda13.0-devel-ubuntu24.04
target: build
push: true
tags: ghcr.io/${{ needs.validate-tag.outputs.repo_lower }}/build-cuda-image:${{ github.event.inputs.version }}
labels: io.buildpacks.base.distro.name=ubuntu,io.buildpacks.base.distro.version=24.04
cache-from: type=gha
cache-to: type=gha,mode=max

create-version-update-pr:
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
needs: [validate-tag, build-and-push-run-image]
needs: [validate-tag, build-and-push-build-run-images]
permissions:
contents: write
pull-requests: write
Expand Down Expand Up @@ -147,7 +178,7 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- uses: buildpacks/github-actions/setup-pack@v5.9.3
- uses: buildpacks/github-actions/setup-pack@v5.9.5

- name: publish buildpacks
run: make publish_buildpacks
Expand Down
128 changes: 128 additions & 0 deletions builders/cuda-selector/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
description = "CUDA enabled builder for Renku frontends and environments."

[[build.env]]
name = "BP_RENKU_FRONTENDS"
value = "vscodium"

[[buildpacks]]
uri = "docker://ghcr.io/swissdatasciencecenter/vscodium-buildpack/vscodium:0.5.1"
id = "vscodium"
version = "0.5.1"

[[buildpacks]]
uri = "../../buildpacks/conda-nodefaults"
version = "0.1.0"

[[buildpacks]]
uri = "../../buildpacks/kernel-installer"
version = "0.1.0"

[[buildpacks]]
uri = "../../buildpacks/jupyterlab"
version = "0.1.0"

[[buildpacks]]
uri = "../../buildpacks/ttyd"
version = "0.1.0"

[[buildpacks]]
uri = "../../buildpacks/python-dependency-manager"
version = "0.1.0"

[[buildpacks]]
uri = "../../buildpacks/rstudio"
version = "0.1.0"

[[buildpacks]]
uri = "docker://docker.io/paketobuildpacks/python:2.38.0"
version = "2.38.0"

[[buildpacks]]
id = "paketo-buildpacks/miniconda"
uri = "docker://docker.io/paketobuildpacks/miniconda:0.11.5"
version = "0.11.5"

[lifecycle]
version = "0.20.16"

[[order]]

[[order.group]]
id = "renku/conda-nodefaults"
version = "0.1.0"
optional = true
[[order.group]]
id = "paketo-buildpacks/miniconda"
version = "0.11.5"
[[order.group]]
id = "paketo-buildpacks/python"
version = "2.38.0"
[[order.group]]
id = "renku/python-dependency-manager"
version = "0.1.0"
[[order.group]]
id = "renku/jupyterlab"
version = "0.1.0"
[[order.group]]
id = "renku/kernel-installer"
version = "0.1.0"

[[order]]
[[order.group]]
id = "renku/conda-nodefaults"
version = "0.1.0"
optional = true
[[order.group]]
id = "paketo-buildpacks/python"
version = "2.38.0"
[[order.group]]
id = "renku/python-dependency-manager"
version = "0.1.0"
[[order.group]]
id = "renku/ttyd"
version = "0.1.0"

[[order]]

[[order.group]]
id = "renku/conda-nodefaults"
version = "0.1.0"
optional = true
[[order.group]]
id = "paketo-buildpacks/python"
version = "2.38.0"
[[order.group]]
id = "renku/python-dependency-manager"
version = "0.1.0"
[[order.group]]
id = "vscodium"
version = "0.5.1"

[[order]]

[[order.group]]
id = "renku/conda-nodefaults"
version = "0.1.0"
optional = true
[[order.group]]
id = "paketo-buildpacks/miniconda"
version = "0.11.5"
[[order.group]]
id = "renku/rstudio"
version = "0.1.0"

[build]
image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/build-cuda-image:0.1.0"

[run]
[[run.images]]
image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/run-cuda-image:0.1.0"
mirrors = []

[[targets]]
os = "linux"
arch = "amd64"

[[targets]]
os = "linux"
arch = "arm64"
59 changes: 28 additions & 31 deletions builders/selector/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name = "BP_RENKU_FRONTENDS"
value = "vscodium"

[[buildpacks]]
uri = "docker://ghcr.io/swissdatasciencecenter/vscodium-buildpack/vscodium:0.3.0"
uri = "docker://ghcr.io/swissdatasciencecenter/vscodium-buildpack/vscodium:0.5.1"
id = "vscodium"
version = "0.3.0"
version = "0.5.1"

[[buildpacks]]
uri = "../../buildpacks/conda-nodefaults"
Expand All @@ -34,36 +34,29 @@ value = "vscodium"
version = "0.1.0"

[[buildpacks]]
uri = "https://github.com/paketo-buildpacks/tini/releases/download/v0.3.2/tini-0.3.2.cnb"
version = "0.3.2"

[[buildpacks]]
uri = "docker://docker.io/paketobuildpacks/python:2.24.3"
version = "2.24.3"
uri = "docker://docker.io/paketobuildpacks/python:2.38.0"
version = "2.38.0"

[[buildpacks]]
id = "paketo-buildpacks/miniconda"
uri = "docker://docker.io/paketobuildpacks/miniconda:0.10.4"
version = "0.10.4"
uri = "docker://docker.io/paketobuildpacks/miniconda:0.11.5"
version = "0.11.5"

[lifecycle]
version = "0.20.6"
version = "0.20.16"

[[order]]

[[order.group]]
id = "renku/conda-nodefaults"
version = "0.1.0"
optional = true
[[order.group]]
id = "paketo-buildpacks/tini"
version = "0.3.2"
[[order.group]]
id = "paketo-buildpacks/miniconda"
version = "0.10.4"
version = "0.11.5"
[[order.group]]
id = "paketo-buildpacks/python"
version = "2.24.3"
version = "2.38.0"
[[order.group]]
id = "renku/python-dependency-manager"
version = "0.1.0"
Expand All @@ -79,12 +72,9 @@ value = "vscodium"
id = "renku/conda-nodefaults"
version = "0.1.0"
optional = true
[[order.group]]
id = "paketo-buildpacks/tini"
version = "0.3.2"
[[order.group]]
id = "paketo-buildpacks/python"
version = "2.24.3"
version = "2.38.0"
[[order.group]]
id = "renku/python-dependency-manager"
version = "0.1.0"
Expand All @@ -100,32 +90,39 @@ value = "vscodium"
optional = true
[[order.group]]
id = "paketo-buildpacks/python"
version = "2.24.3"
version = "2.38.0"
[[order.group]]
id = "renku/python-dependency-manager"
version = "0.1.0"
[[order.group]]
id = "vscodium"
version = "0.3.0"
version = "0.5.1"

[[order]]

[[order.group]]
id = "renku/conda-nodefaults"
version = "0.1.0"
optional = true
[[order.group]]
id = "paketo-buildpacks/tini"
version = "0.3.2"
[[order.group]]
id = "paketo-buildpacks/miniconda"
version = "0.10.4"
version = "0.11.5"
[[order.group]]
id = "renku/rstudio"
version = "0.1.0"

[stack]
build-image = "docker.io/paketobuildpacks/builder-jammy-buildpackless-full:0.0.256"
id = "io.buildpacks.stacks.jammy"
run-image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/base-image:0.1.0"
run-image-mirrors = []
[build]
image = "index.docker.io/paketobuildpacks/ubuntu-noble-build:0.0.38"

[run]
[[run.images]]
image = "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/base-image:0.1.0"
mirrors = []

[[targets]]
os = "linux"
arch = "amd64"

[[targets]]
os = "linux"
arch = "arm64"
4 changes: 4 additions & 0 deletions buildpacks/conda-nodefaults/buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ version = "0.1.0"
[[targets]]
os = "linux"
arch = "amd64"

[[targets]]
os = "linux"
arch = "arm64"
6 changes: 0 additions & 6 deletions buildpacks/jupyterlab/bin/detect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ cat >"${CNB_BUILD_PLAN_PATH}" <<EOL
[[provides]]
name = "jupyterlab"

[[requires]]
name = "tini"

[requires.metadata]
launch = true

Comment on lines -21 to -26
Copy link
Member

@olevski olevski Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: why remove this? If it is already there I think then it won't be installed. I think with the changes you have made with this and by adding tini to the run image then you make the buildpacks only work with our run image. I was hoping we can keep things as general as possible.

Copy link
Collaborator Author

@SalimKayal SalimKayal Oct 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tini is not multi-arch in paketo's buildpack. I could make my own tini buildpack instead if it's any useful

[[requires]]
name = "jupyterlab"

Expand Down
4 changes: 4 additions & 0 deletions buildpacks/jupyterlab/buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ version = "0.1.0"
[[targets]]
os = "linux"
arch = "amd64"

[[targets]]
os = "linux"
arch = "arm64"
11 changes: 10 additions & 1 deletion buildpacks/rstudio/bin/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,20 @@ mkdir -p "${launch_env_dir}"
RSTUDIO_VERSION="2024.12.1-563"
OS_CODENAME=$(lsb_release -c --short)
FNAME="rstudio-$RSTUDIO_VERSION.deb"

ARCH=$(uname -m)

case "$ARCH" in
x86_64) ARCH=amd64 ;;
arm64|aarch64) ARCH=arm64 ;;
*) echo "Unsupported architecture: $ARCH"; exit 1 ;;
esac

if [ -f "$cache_layer_dir/$FNAME" ]; then
echo "Found rstudio $RSTUDIO_VERSION in $cache_layer_dir skipping download"
else
echo "Downloading rstudio $RSTUDIO_VERSION in $cache_layer_dir"
curl -sSL "https://download2.rstudio.org/server/$OS_CODENAME/amd64/rstudio-server-$RSTUDIO_VERSION-amd64.deb" -o "$cache_layer_dir/$FNAME"
curl -sSL "https://download2.rstudio.org/server/$OS_CODENAME/$ARCH/rstudio-server-$RSTUDIO_VERSION-$ARCH.deb" -o "$cache_layer_dir/$FNAME"
fi

echo "Unpacking $cache_layer_dir/$FNAME in /tmp/rstudio"
Expand Down
6 changes: 0 additions & 6 deletions buildpacks/rstudio/bin/detect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ cat >"${CNB_BUILD_PLAN_PATH}" <<EOL
[requires.metadata]
launch = true

[[requires]]
name = "tini"

[requires.metadata]
launch = true

[[requires]]
name = "conda"

Expand Down
4 changes: 4 additions & 0 deletions buildpacks/rstudio/buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ version = "0.1.0"
[[targets]]
os = "linux"
arch = "amd64"

[[targets]]
os = "linux"
arch = "arm64"
Loading
Loading