Feature/x86 image (#349)

* remove unused images Signed-off-by: Masaya Kataoka <[email protected]> * add linux/amd64 to the platform Signed-off-by: Masaya Kataoka <[email protected]> * update base image Signed-off-by: Masaya Kataoka <[email protected]> --------- Signed-off-by: Masaya Kataoka <[email protected]>
OUXT-Polaris · Aug 17, 2024 · 2037292 · 2037292
1 parent 55e0d12
commit 2037292
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 346 deletions.
diff --git a/.github/workflows/docker/dev_container/Dockerfile b/.github/workflows/docker/dev_container/Dockerfile
diff --git a/.github/workflows/docker/dev_container/README.md b/.github/workflows/docker/dev_container/README.md
diff --git a/.github/workflows/docker/dev_container/action.yaml b/.github/workflows/docker/dev_container/action.yaml
diff --git a/.github/workflows/docker/dev_container/entrypoint.sh b/.github/workflows/docker/dev_container/entrypoint.sh
diff --git a/.github/workflows/docker/dev_container/entrypoint_vnc.sh b/.github/workflows/docker/dev_container/entrypoint_vnc.sh
diff --git a/.github/workflows/docker/dev_container/tmp/.gitignore b/.github/workflows/docker/dev_container/tmp/.gitignore
diff --git a/.github/workflows/docker/l4t_opencv/Dockerfile b/.github/workflows/docker/l4t_opencv/Dockerfile
diff --git a/.github/workflows/docker/l4t_opencv/action.yaml b/.github/workflows/docker/l4t_opencv/action.yaml
diff --git a/.github/workflows/docker/wamv/Dockerfile b/.github/workflows/docker/wamv/Dockerfile
@@ -1,4 +1,6 @@
-FROM docker.io/hakuturu583/cuda_ros:lt4-humble-cuda-12.2.2-devel
+ARG BASE_IMAGE=docker.io/hakuturu583/cuda_ros:lt4-humble-cuda-12.2.2-devel
+
+FROM $BASE_IMAGE
 SHELL ["/bin/bash", "-c"]
 
 RUN apt-get update && \

diff --git a/.github/workflows/docker/wamv/action.yaml b/.github/workflows/docker/wamv/action.yaml
@@ -11,6 +11,12 @@ inputs:
   module:
     description: "Software module"
     required: true
+  base_image:
+    description: "Name of base image"
+    required: true
+  platform:
+    description: "Platform of the image"
+    required: true
 
 runs:
   using: "composite"
@@ -37,7 +43,9 @@ runs:
         cache-from: type=registry,ref=wamvtan/wamv_${{ inputs.module }}:buildcache
         cache-to: type=registry,ref=wamvtan/wamv_${{ inputs.module }}:buildcache,mode=max
         push: true
-        platforms: linux/arm64/v8
+        platforms: ${{ inputs.platform }}
+        build-args: |
+          BASE_IMAGE=${{ inputs.base_image }}
     - name: Build Docker Image
       if: ${{ github.event_name == 'pull_request'}}
       uses: docker/build-push-action@v2
@@ -52,4 +60,6 @@ runs:
         no-cache: false
         cache-from: type=registry,ref=wamvtan/wamv_${{ inputs.module }}:buildcache
         push: false
-        platforms: linux/arm64/v8
+        platforms: ${{ inputs.platform }}
+        build-args: |
+          BASE_IMAGE=${{ inputs.base_image }}