feat(.dockerignore): revise .dockerignore to correctly ignore copying unrelated files

.dockerignore

@@ -7,11 +7,20 @@
 *.md
 
 # Ignore Docker files
-docker-bake.hcl
+docker
+!docker/etc
 
-# Etc
-*.ignore
-*.lint
-*.lock
-*.log
-*.out
+# Ignore a part of files under src
+src/**/.*
+src/**/*.asc
+src/**/*.csv
+src/**/*.gif
+src/**/*.md
+src/**/*.pcd
+src/**/*.png
+src/**/*.svg
+
+# Ignore generated files by colcon
+build
+install
+log

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

@@ -55,7 +55,6 @@ runs:
       with:
         path: |
           var-cache-apt
-          var-lib-apt
         key: apt-get-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/package.xml') }}
         restore-keys: |
           apt-get-${{ inputs.platform }}-${{ inputs.name }}-
@@ -67,8 +66,7 @@ runs:
         cache-map: |
           {
             "root-ccache": "/root/.ccache",
-            "var-cache-apt": "/var/cache/apt",
-            "var-lib-apt": "/var/lib/apt"
+            "var-cache-apt": "/var/cache/apt"
           }
         skip-extraction: true
 

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

@@ -37,7 +37,7 @@
     - name: Cache ccache
       uses: actions/cache@v4
       if: ${{ inputs.name == 'no-cuda' && github.ref == 'refs/heads/main' }}
       id: cache-ccahce
       with:
         path: |
           root-ccache
@@ -53,7 +53,6 @@
       with:
         path: |
           var-cache-apt
-          var-lib-apt
         key: apt-get-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/package.xml') }}
         restore-keys: |
           apt-get-${{ inputs.platform }}-${{ inputs.name }}-
@@ -76,7 +75,6 @@
       with:
         path: |
           var-cache-apt
-          var-lib-apt
         key: apt-get-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/package.xml') }}
         restore-keys: |
           apt-get-${{ inputs.platform }}-${{ inputs.name }}-
@@ -88,8 +86,7 @@
         cache-map: |
           {
             "root-ccache": "/root/.ccache",
-            "var-cache-apt": "/var/cache/apt",
-            "var-lib-apt": "/var/lib/apt"
+            "var-cache-apt": "/var/cache/apt"
           }
         skip-extraction: ${{ steps.cache-ccache.outputs.cache-hit && steps.cache-apt-get.outputs.cache-hit }}
 

docker/Dockerfile

@@ -9,7 +9,6 @@ ARG ROS_DISTRO
 RUN rm -f /etc/apt/apt.conf.d/docker-clean \
   && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
   apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
   gosu \
   ssh \
@@ -25,7 +24,6 @@ WORKDIR /autoware
 # Set up base environment
 RUN --mount=type=ssh \
   --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
   ./setup-dev-env.sh -y --module base --runtime openadkit \
   && pip uninstall -y ansible ansible-core \
   && apt-get autoremove -y && rm -rf "$HOME"/.cache \
@@ -46,7 +44,6 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
   && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' >/etc/apt/apt.conf.d/keep-cache
 RUN --mount=type=ssh \
   --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
   ./setup-dev-env.sh -y rosdep \
   && pip uninstall -y ansible ansible-core \
   && apt-get autoremove -y && rm -rf "$HOME"/.cache
@@ -91,7 +88,6 @@ ENV CCACHE_DIR="/root/.ccache"
 # Set up development environment
 RUN --mount=type=ssh \
   --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
   ./setup-dev-env.sh -y --module all ${SETUP_ARGS} --no-cuda-drivers openadkit \
   && pip uninstall -y ansible ansible-core \
   && apt-get autoremove -y && rm -rf "$HOME"/.cache
@@ -100,7 +96,6 @@ RUN --mount=type=ssh \
 COPY --from=rosdep-depend /rosdep-core-depend-packages.txt /tmp/rosdep-core-depend-packages.txt
 # hadolint ignore=SC2002
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
   apt-get update \
   && cat /tmp/rosdep-core-depend-packages.txt | xargs apt-get install -y --no-install-recommends \
   && apt-get autoremove -y && rm -rf "$HOME"/.cache
@@ -153,7 +148,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install development tools and artifacts
 RUN --mount=type=ssh \
   --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
   ./setup-dev-env.sh -y --module dev-tools --download-artifacts openadkit \
   && pip uninstall -y ansible ansible-core \
   && apt-get autoremove -y && rm -rf "$HOME"/.cache
@@ -175,7 +169,6 @@ COPY --from=rosdep-depend /rosdep-exec-depend-packages.txt /tmp/rosdep-exec-depe
 # hadolint ignore=SC2002
 RUN --mount=type=ssh \
   --mount=type=cache,target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,target=/var/lib/apt,sharing=locked \
   ./setup-dev-env.sh -y --module all ${SETUP_ARGS} --download-artifacts --no-cuda-drivers --runtime openadkit \
   && pip uninstall -y ansible ansible-core \
   && apt-get update \