Skip to content

Commit

Permalink
Fix cache concurrency bug
Browse files Browse the repository at this point in the history
  • Loading branch information
f0reachARR committed Feb 18, 2024
1 parent 8fa3caf commit 730e0ad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions buildroot/Dockerfile.amd64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions buildroot/Dockerfile.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down

0 comments on commit 730e0ad

Please sign in to comment.