From 730e0ad47293dd89ead7a350c1269216518f6eda Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Sun, 18 Feb 2024 14:01:17 +0900 Subject: [PATCH] Fix cache concurrency bug --- buildroot/Dockerfile.amd64 | 4 ++-- buildroot/Dockerfile.arm64 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildroot/Dockerfile.amd64 b/buildroot/Dockerfile.amd64 index 0dbd32e..7160e99 100644 --- a/buildroot/Dockerfile.amd64 +++ b/buildroot/Dockerfile.amd64 @@ -4,7 +4,7 @@ FROM docker.io/hakuturu583/cuda_ros:humble-cuda-12.2.0-devel as build_stage ENV DEBIAN_FRONTEND=noninteractive -RUN --mount=type=cache,target=/var/lib/apt apt-get update && \ +RUN --mount=type=cache,target=/var/lib/apt,sharing=private apt-get update && \ apt-get install -y \ python3-vcstool git python3-colcon-common-extensions python3-rosdep \ python3-bloom fakeroot \ @@ -15,7 +15,7 @@ RUN mkdir -p /tmp/ws/meta COPY package.xml /tmp/ws/meta/package.xml COPY rosdep.yaml /tmp/ws/rosdep.yaml -RUN --mount=type=cache,target=/var/lib/apt \ +RUN --mount=type=cache,target=/var/lib/apt,sharing=private \ echo "yaml file:///tmp/ws/rosdep.yaml" > /etc/ros/rosdep/sources.list.d/61-customized-rosdep.list \ && rosdep update \ && rosdep install --from-paths /tmp/ws --ignore-src --rosdistro ${ROS_DISTRO} -y \ diff --git a/buildroot/Dockerfile.arm64 b/buildroot/Dockerfile.arm64 index bae94d8..a313c7c 100644 --- a/buildroot/Dockerfile.arm64 +++ b/buildroot/Dockerfile.arm64 @@ -6,7 +6,7 @@ FROM docker.io/hakuturu583/cuda_ros:lt4-humble-cuda-12.2.2-devel as build_stage ENV DEBIAN_FRONTEND=noninteractive ENV DENO_NO_UPDATE_CHECK=1 -RUN --mount=type=cache,target=/var/lib/apt apt-get update && \ +RUN --mount=type=cache,target=/var/lib/apt,sharing=private apt-get update && \ apt-get install -y \ python3-vcstool git python3-colcon-common-extensions python3-rosdep \ python3-bloom fakeroot \ @@ -17,7 +17,7 @@ RUN mkdir -p /tmp/ws/meta COPY package.xml /tmp/ws/meta/package.xml COPY rosdep.yaml /tmp/ws/rosdep.yaml -RUN --mount=type=cache,target=/var/lib/apt \ +RUN --mount=type=cache,target=/var/lib/apt,sharing=private \ echo "yaml file:///tmp/ws/rosdep.yaml" > /etc/ros/rosdep/sources.list.d/61-customized-rosdep.list \ && rosdep update \ && rosdep install --from-paths /tmp/ws --ignore-src --rosdistro ${ROS_DISTRO} -y \