.

Signed-off-by: Oguz Ozturk <[email protected]>

.github/actions/docker-build-and-push/action.yaml

@@ -81,6 +81,18 @@ runs:
       run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
       shell: bash
 
+    - name: Docker meta for autoware:aws-reinvent-simulator-monolithic-devel
+      id: meta-aws-reinvent-simulator-monolithic-devel
+      uses: docker/metadata-action@v5
+      with:
+        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }}
+        tags: |
+          type=raw,value=aws-reinvent-simulator-monolithic-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
+          type=raw,value=aws-reinvent-simulator-monolithic-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+        bake-target: docker-metadata-action-aws-reinvent-simulator-monolithic-devel
+        flavor: |
+          latest=false
+
     - name: Docker meta for autoware:aws-reinvent-simulator-monolithic
       id: meta-aws-reinvent-simulator-monolithic
       uses: docker/metadata-action@v5
@@ -107,6 +119,7 @@ runs:
         files: |
           docker/docker-bake.hcl
           ${{ steps.meta-aws-reinvent-simulator-monolithic.outputs.bake-file }}
+          ${{ steps.meta-aws-reinvent-simulator-monolithic-devel.outputs.bake-file }}
         provenance: false
         set: |
           ${{ inputs.build-args }}

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/autowarefoundation/autoware:universe-devel AS simulator-devel
+FROM ghcr.io/autowarefoundation/autoware:universe-devel AS aws-reinvent-simulator-monolithic-devel
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
 ENV CCACHE_DIR="/root/.ccache"
@@ -19,7 +19,8 @@ RUN  source /opt/ros/"$ROS_DISTRO"/setup.bash \
 && colcon build --cmake-args \
   " -Wno-dev" \
   " --no-warn-unused-cli" \
-  --install-base /opt/simulator \
+  --install-base /opt/autoware \
+  --merge-install \
   --mixin release compile-commands ccache \
   --base-paths /autoware/src/simulator
 

docker/docker-bake.hcl

@@ -1,10 +1,19 @@
 group "default" {
   targets = [
+    "aws-reinvent-simulator-monolithic-devel",
     "aws-reinvent-simulator-monolithic"
   ]
 }
+
+target "docker-metadata-action-aws-reinvent-simulator-monolithic-devel" {}
 target "docker-metadata-action-aws-reinvent-simulator-monolithic" {}
 
+target "aws-reinvent-simulator-monolithic-devel" {
+  inherits = ["docker-metadata-action-aws-reinvent-simulator-monolithic-devel"]
+  dockerfile = "docker/Dockerfile"
+  target = "aws-reinvent-simulator-monolithic-devel"
+}
+
 target "aws-reinvent-simulator-monolithic" {
   inherits = ["docker-metadata-action-aws-reinvent-simulator-monolithic"]
   dockerfile = "docker/Dockerfile"