Add partial jammy support

ForteFibre · May 31, 2024 · e384717 · e384717
1 parent 0153a5b
commit e384717
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -14,6 +14,12 @@ jobs:
     strategy:
       matrix:
         target: [amd64, amd64_small, aarch64, aarch64_small]
+        rosdistro: [humble, jazzy]
+        exclude:
+          - target: amd64
+            rosdistro: jazzy
+          - target: aarch64
+            rosdistro: jazzy
     steps:
       - uses: actions/checkout@v4
 
@@ -39,6 +45,7 @@ jobs:
           set: |
             *.cache-to=type=registry,ref=ghcr.io/fortefibre/buildroot-${{ matrix.target }}-cache,mode=max
             *.cache-from=type=registry,ref=ghcr.io/fortefibre/buildroot-${{ matrix.target }}-cache
+            *.args.ROS_DISTRO=${{ matrix.rosdistro }}
 
   pull:
     runs-on: GPU

diff --git a/buildroot/Dockerfile.amd64 b/buildroot/Dockerfile.amd64
@@ -1,6 +1,7 @@
 ARG ROS_DISTRO=humble
+ARG BASE_IMAGE
 
-FROM docker.io/hakuturu583/cuda_ros:humble-cuda-12.2.0-devel as build_stage
+FROM $BASE_IMAGE as build_stage
 
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/buildroot/Dockerfile.arm64 b/buildroot/Dockerfile.arm64
@@ -1,7 +1,8 @@
 ARG ROS_DISTRO=humble
+ARG BASE_IMAGE
 
-FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.0.1 AS mimic-host
-FROM docker.io/hakuturu583/cuda_ros:lt4-humble-cuda-12.2.2-devel as build_stage
+FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.3.0 AS mimic-host
+FROM $BASE_IMAGE as build_stage
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DENO_NO_UPDATE_CHECK=1

diff --git a/buildroot/Dockerfile.small.amd64 b/buildroot/Dockerfile.small.amd64
@@ -1,6 +1,6 @@
 ARG ROS_DISTRO=humble
 
-FROM ros:${ROS_DISTRO}-perception-jammy as build_stage
+FROM ros:${ROS_DISTRO}-perception as build_stage
 
 ENV DEBIAN_FRONTEND=noninteractive
 

diff --git a/buildroot/Dockerfile.small.arm64 b/buildroot/Dockerfile.small.arm64
@@ -1,7 +1,7 @@
 ARG ROS_DISTRO=humble
 
-FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.0.1 AS mimic-host
-FROM ros:${ROS_DISTRO}-perception-jammy as build_stage
+FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.3.0 AS mimic-host
+FROM ros:${ROS_DISTRO}-perception as build_stage
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DENO_NO_UPDATE_CHECK=1

diff --git a/buildroot/deb-s3/entrypoint.bash b/buildroot/deb-s3/entrypoint.bash
@@ -2,11 +2,12 @@
 
 set -e
 echo "$INPUT_GPG_PRIVATE_KEY" | gpg --import || true
+CODENAME=${INPUT_CODENAME:-jammy}
 deb-s3 upload --bucket $INPUT_S3_BUCKET \
     --access-key-id $INPUT_S3_ACCESS_KEY_ID \
     --secret-access-key $INPUT_S3_ACCESS_KEY_SECRET \
     --component main \
     --endpoint $INPUT_S3_ENDPOINT \
     --sign $INPUT_GPG_FINGERPRINT \
-    --codename jammy \
-    $INPUT_INPUT_DIR/*.deb
+    --codename $CODENAME \
+    $INPUT_INPUT_DIR/*.deb
diff --git a/buildroot/docker-bake.hcl b/buildroot/docker-bake.hcl
@@ -8,13 +8,19 @@ target "amd64" {
     dockerfile = "Dockerfile.amd64"
     platforms = ["linux/amd64"]
     tags = ["ghcr.io/fortefibre/buildroot:humble-amd64"]
+    args = {
+        BASE_IMAGE = "docker.io/hakuturu583/cuda_ros:humble-cuda-12.2.0-devel"
+    }
 }
 
 target "aarch64" {
     target = "build_stage"
     dockerfile = "Dockerfile.arm64"
     platforms = ["linux/arm64"]
     tags = ["ghcr.io/fortefibre/buildroot:humble-aarch64"]
+    args = {
+        BASE_IMAGE = "docker.io/hakuturu583/cuda_ros:lt4-humble-cuda-12.2.2-devel"
+    }
 }
 
 target "amd64_small" {

diff --git a/update_apt_repo/action.yml b/update_apt_repo/action.yml
@@ -17,6 +17,8 @@ inputs:
     description: "GPG private key to sign release file"
   gpg_fingerprint:
     description: "GPG fingerprint"
+  codename:
+    description: Ubuntu codename
 
 runs:
   using: "docker"