.

Signed-off-by: Oguz Ozturk <[email protected]>
autowarefoundation · Mar 15, 2024 · 1177b61 · 1177b61
1 parent 4032c56
commit 1177b61
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/docker/autoware-openadk/docker-bake.hcl b/docker/autoware-openadk/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-  targets = ["base", "planning-control", "visualizer", "simulator"]
+  targets = ["base", "planning-control", "visualizer"]
 }
 
 // For docker/metadata-action

diff --git a/docker/autoware-openadk/docker-compose.yaml → ...ware-openadk/services/docker-compose.yaml b/docker/autoware-openadk/docker-compose.yaml → ...ware-openadk/services/docker-compose.yaml
diff --git a/docker/autoware-openadk/services/planning-control/Dockerfile b/docker/autoware-openadk/services/planning-control/Dockerfile
@@ -1,11 +1,11 @@
 ARG PLATFORM
-FROM ghcr.io/autowarefoundation/autoware-openadk:latest-base-${PLATFORM} as planning-control
+FROM ghcr.io/autowarefoundation/autoware-openadk:latest-base as planning-control
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG PLATFORM
 ARG ROS_DISTRO
 
 # Copy install folder from prebuilt
-COPY --from=ghcr.io/autowarefoundation/autoware:latest-prebuilt-${PLATFORM} /autoware/install/ /autoware/install/
+COPY --from=ghcr.io/autowarefoundation/autoware:latest-prebuilt /autoware/install/ /autoware/install/
 COPY autoware.repos /autoware/
 
 # Dependencies

diff --git a/docker/autoware-openadk/services/simulator/Dockerfile b/docker/autoware-openadk/services/simulator/Dockerfile
@@ -1,5 +1,5 @@
 ARG PLATFORM
-FROM ghcr.io/autowarefoundation/autoware-openadk:latest-base-${PLATFORM} as simulator-base
+FROM ghcr.io/autowarefoundation/autoware-openadk:latest-base as simulator-base
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG PLATFORM
 ARG ROS_DISTRO
@@ -39,7 +39,7 @@ RUN source /opt/ros/"$ROS_DISTRO"/setup.bash \
   /usr/lib/jvm \
   /usr/lib/llvm*
 
-FROM ghcr.io/autowarefoundation/autoware-openadk:base-${ROS_DISTRO}-${PLATFORM} as simulator
+FROM ghcr.io/autowarefoundation/autoware-openadk:base-${ROS_DISTRO} as simulator
 ARG PLATFORM
 ARG ROS_DISTRO
 

diff --git a/docker/autoware-openadk/services/visualizer/Dockerfile b/docker/autoware-openadk/services/visualizer/Dockerfile
@@ -1,11 +1,11 @@
 ARG PLATFORM
-FROM ghcr.io/autowarefoundation/autoware-openadk:latest-base-${PLATFORM} as visualizer
+FROM ghcr.io/autowarefoundation/autoware-openadk:latest-base as visualizer
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG PLATFORM
 ARG ROS_DISTRO
 
 # Copy install folder from prebuilt
-COPY --from=ghcr.io/autowarefoundation/autoware:latest-prebuilt-${PLATFORM} /autoware/install/ /autoware/install/
+COPY --from=ghcr.io/autowarefoundation/autoware:latest-prebuilt /autoware/install/ /autoware/install/
 COPY autoware.repos /autoware/
 
 # Dependencies