From 165698266e79c3d6e048bb1900fd548b8dc57790 Mon Sep 17 00:00:00 2001
From: Masaya Kataoka <ms.kataoka@gmail.com>
Date: Thu, 15 Feb 2024 15:14:14 +0900
Subject: [PATCH] update docker build command

Signed-off-by: Masaya Kataoka <ms.kataoka@gmail.com>
---
 .github/workflows/Docker.yaml | 32 +++++---------------------------
 Dockerfile                    |  2 +-
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml
index 61a691d0ee8..bd123138adb 100644
--- a/.github/workflows/Docker.yaml
+++ b/.github/workflows/Docker.yaml
@@ -34,8 +34,6 @@ jobs:
           wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz
           tar -xvzf docker-25.0.3.tgz
           cp docker/docker /usr/local/bin/
-          mkdir -p $HOME/.docker/cli-plugins
-          wget https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64 -O $HOME/.docker/cli-plugins/docker-buildx
 
       - uses: actions/checkout@v3
 
@@ -46,30 +44,10 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push (amd64)
-        uses: docker/bake-action@v3
-        if: ${{ matrix.runs_on == 'ubuntu-22.04' }}
-        with:
-          files: |
-            ./docker-bake.hcl
-          workdir: .
-          no-cache: true
-          push: ${{ github.event_name != 'pull_request' }}
-          targets: |
-            ${{ matrix.rosdistro }}
-          set: |
-            *.platform=linux/amd64
+      - name: Build (amd64)
+        if: ${{ matrix.runs_on == 'ubuntu-22.04'}}
+        run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }} --platform linux/amd64 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }}
 
-      - name: Build and push (arm64)
-        uses: docker/bake-action@v3
+      - name: Build (arm64)
         if: ${{ matrix.runs_on == 'macos-14'}}
-        with:
-          files: |
-            ./docker-bake.hcl
-          workdir: .
-          no-cache: true
-          push: ${{ github.event_name != 'pull_request' }}
-          targets: |
-            ${{ matrix.rosdistro }}
-          set: |
-            *.platform=linux/arm64/v8
+        run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }} --platform linux/arm64/v8 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }}
diff --git a/Dockerfile b/Dockerfile
index 0570c1df950..85a8ddc3ee3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ROS_DISTRO
+ARG ROS_DISTRO="humble"
 FROM ros:${ROS_DISTRO} as build-stage
 SHELL ["/bin/bash", "-c"]
 ENV DEBIAN_FRONTEND=noninteractive