diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index e28a7edec28..24d564f6e8b 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -89,7 +89,7 @@ runs: echo "$EOF" >> $GITHUB_OUTPUT shell: bash - - name: Docker meta for base + - name: Docker meta for autoware:base id: meta-base uses: docker/metadata-action@v5 with: @@ -100,29 +100,29 @@ runs: latest=false suffix=-base${{ inputs.tag-suffix }} - - name: Docker meta for autoware-core - id: meta-autoware-core + - name: Docker meta for autoware:core-devel + id: meta-core-devel uses: docker/metadata-action@v5 with: images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} tags: ${{ steps.set-docker-tags.outputs.tags }} - bake-target: docker-metadata-action-autoware-core + bake-target: docker-metadata-action-core-devel flavor: | latest=false - suffix=-autoware-core${{ inputs.tag-suffix }} + suffix=-core-devel${{ inputs.tag-suffix }} - - name: Docker meta for autoware-universe - id: meta-autoware-universe + - name: Docker meta for autoware:universe-devel + id: meta-universe-devel uses: docker/metadata-action@v5 with: images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} tags: ${{ steps.set-docker-tags.outputs.tags }} - bake-target: docker-metadata-action-autoware-universe + bake-target: docker-metadata-action-universe-devel flavor: | latest=false - suffix=-autoware-universe${{ inputs.tag-suffix }} + suffix=-universe-devel${{ inputs.tag-suffix }} - - name: Docker meta for devel + - name: Docker meta for autoware:devel id: meta-devel uses: docker/metadata-action@v5 with: @@ -133,16 +133,16 @@ runs: latest=false suffix=-devel${{ inputs.tag-suffix }} - - name: Docker meta for runtime - id: meta-runtime + - name: Docker meta for autoware:universe + id: meta-universe uses: docker/metadata-action@v5 with: images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} tags: ${{ steps.set-docker-tags.outputs.tags }} - bake-target: docker-metadata-action-runtime + bake-target: docker-metadata-action-universe flavor: | latest=auto - suffix=-runtime${{ inputs.tag-suffix }} + suffix=-universe${{ inputs.tag-suffix }} - name: Login to GitHub Container Registry uses: docker/login-action@v3 @@ -158,10 +158,10 @@ runs: files: | docker/docker-bake.hcl ${{ steps.meta-base.outputs.bake-file }} - ${{ steps.meta-autoware-core.outputs.bake-file }} - ${{ steps.meta-autoware-universe.outputs.bake-file }} + ${{ steps.meta-core-devel.outputs.bake-file }} + ${{ steps.meta-universe-devel.outputs.bake-file }} ${{ steps.meta-devel.outputs.bake-file }} - ${{ steps.meta-runtime.outputs.bake-file }} + ${{ steps.meta-universe.outputs.bake-file }} provenance: false set: | ${{ inputs.build-args }} diff --git a/docker/Dockerfile b/docker/Dockerfile index f053916daea..a346470a029 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -105,7 +105,7 @@ RUN rosdep keys --dependency-types=exec --ignore-src --from-paths src \ > /rosdep-exec-depend-packages.txt \ && cat /rosdep-exec-depend-packages.txt -FROM base AS autoware-core +FROM base AS core-devel SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ENV CCACHE_DIR="/root/.ccache" @@ -138,7 +138,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \ && du -sh ${CCACHE_DIR} && ccache -s \ && rm -rf /autoware/build -FROM autoware-core AS autoware-universe-common +FROM core-devel AS universe-common-devel SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ENV CCACHE_DIR="/root/.ccache" @@ -170,7 +170,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \ && du -sh ${CCACHE_DIR} && ccache -s \ && rm -rf /autoware/build -FROM autoware-universe-common AS autoware-universe-sensing-perception +FROM universe-common-devel AS universe-sensing-perception-devel SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ENV CCACHE_DIR="/root/.ccache" @@ -201,7 +201,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \ CMD ["/bin/bash"] -FROM autoware-universe-common AS autoware-universe +FROM universe-common-devel AS universe-devel SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ENV CCACHE_DIR="/root/.ccache" @@ -214,7 +214,7 @@ RUN --mount=type=ssh \ && cat /tmp/rosdep-universe-depend-packages.txt | xargs apt-get install -y --no-install-recommends \ && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache -COPY --from=autoware-universe-sensing-perception /opt/autoware /opt/autoware +COPY --from=universe-sensing-perception-devel /opt/autoware /opt/autoware # hadolint ignore=SC1091 RUN --mount=type=cache,target=${CCACHE_DIR} \ --mount=type=bind,from=rosdep-depend,source=/autoware/src/launcher,target=/autoware/src/launcher \ @@ -246,7 +246,7 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \ CMD ["/bin/bash"] -FROM autoware-universe AS devel +FROM universe-devel AS devel SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Install development tools and artifacts @@ -262,7 +262,7 @@ RUN chmod +x /ros_entrypoint.sh ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"] -FROM base AS runtime +FROM base AS universe SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG LIB_DIR @@ -287,7 +287,7 @@ RUN --mount=type=ssh \ /etc/apt/sources.list.d/docker.list /etc/apt/sources.list.d/nvidia-docker.list \ /usr/include /usr/share/doc /usr/lib/gcc /usr/lib/jvm /usr/lib/llvm* -COPY --from=autoware-universe /opt/autoware /opt/autoware +COPY --from=universe-devel /opt/autoware /opt/autoware # Copy bash aliases COPY docker/etc/.bash_aliases /root/.bash_aliases diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl index 9e3fb6536a7..978f622fadb 100644 --- a/docker/docker-bake.hcl +++ b/docker/docker-bake.hcl @@ -1,13 +1,13 @@ group "default" { - targets = ["base", "autoware-core", "autoware-universe", "devel", "runtime"] + targets = ["base", "core-devel", "universe-devel", "devel", "universe"] } // For docker/metadata-action target "docker-metadata-action-base" {} -target "docker-metadata-action-autoware-core" {} -target "docker-metadata-action-autoware-universe" {} +target "docker-metadata-action-core-devel" {} +target "docker-metadata-action-universe-devel" {} target "docker-metadata-action-devel" {} -target "docker-metadata-action-runtime" {} +target "docker-metadata-action-universe" {} target "base" { inherits = ["docker-metadata-action-base"] @@ -15,16 +15,16 @@ target "base" { target = "base" } -target "autoware-core" { - inherits = ["docker-metadata-action-autoware-core"] +target "core-devel" { + inherits = ["docker-metadata-action-core-devel"] dockerfile = "docker/Dockerfile" - target = "autoware-core" + target = "core-devel" } -target "autoware-universe" { - inherits = ["docker-metadata-action-autoware-universe"] +target "universe-devel" { + inherits = ["docker-metadata-action-universe-devel"] dockerfile = "docker/Dockerfile" - target = "autoware-universe" + target = "universe-devel" } target "devel" { @@ -33,8 +33,8 @@ target "devel" { target = "devel" } -target "runtime" { - inherits = ["docker-metadata-action-runtime"] +target "universe" { + inherits = ["docker-metadata-action-universe"] dockerfile = "docker/Dockerfile" - target = "runtime" + target = "universe" }