From ffddeace6e18fcda72e4d7a5f18e87399a74f8f9 Mon Sep 17 00:00:00 2001
From: Justin Newberry <justin@comma.ai>
Date: Sun, 27 Aug 2023 19:52:38 -0700
Subject: [PATCH] CI: fix sim/docs scons cache invalidation (#29639)

* fix sim and docs images

* fix that

* that's a weird issue

* exists should work fine

* as little diff as possible
old-commit-hash: 5716dfc9b54f9f24e412ae020ac572ccec6ae1c9
---
 docs/docker/Dockerfile   |  8 +++----
 tools/sim/Dockerfile.sim | 45 +++++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/docs/docker/Dockerfile b/docs/docker/Dockerfile
index e079fe6223..240f828912 100644
--- a/docs/docker/Dockerfile
+++ b/docs/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ghcr.io/commaai/openpilot-base:latest
 
 ENV PYTHONUNBUFFERED 1
 
-ENV OPENPILOT_PATH /home/batman/openpilot/
+ENV OPENPILOT_PATH /tmp/openpilot
 ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
 ENV POETRY_VIRUALENVS_CREATE false
 
@@ -15,8 +15,8 @@ COPY ./openpilot ${OPENPILOT_PATH}/openpilot
 COPY ./body ${OPENPILOT_PATH}/body
 COPY ./third_party ${OPENPILOT_PATH}/third_party
 COPY ./site_scons ${OPENPILOT_PATH}/site_scons
-COPY ./laika ${OPENPILOT_PATH}/laika
 COPY ./laika_repo ${OPENPILOT_PATH}/laika_repo
+RUN ln -s ${OPENPILOT_PATH}/laika_repo ${OPENPILOT_PATH}/laika
 COPY ./rednose ${OPENPILOT_PATH}/rednose
 COPY ./rednose_repo ${OPENPILOT_PATH}/rednose_repo
 COPY ./tools ${OPENPILOT_PATH}/tools
@@ -29,7 +29,7 @@ COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
 COPY ./system ${OPENPILOT_PATH}/system
 COPY ./*.md ${OPENPILOT_PATH}/
 
-RUN --mount=type=bind,source=.ci_cache/scons_cache,target=/tmp/scons_cache,rw scons -j$(nproc)
+RUN --mount=type=bind,source=.ci_cache/scons_cache,target=/tmp/scons_cache,rw scons -j$(nproc) --cache-readonly
 
 RUN apt update && apt install doxygen -y
 COPY ./docs ${OPENPILOT_PATH}/docs
@@ -38,5 +38,5 @@ WORKDIR ${OPENPILOT_PATH}/docs
 RUN make html
 
 FROM nginx:1.21
-COPY --from=0 /home/batman/openpilot/build/docs/html /usr/share/nginx/html
+COPY --from=0 /tmp/openpilot/build/docs/html /usr/share/nginx/html
 COPY ./docs/docker/nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/tools/sim/Dockerfile.sim b/tools/sim/Dockerfile.sim
index 8de5266841..800e9dac74 100644
--- a/tools/sim/Dockerfile.sim
+++ b/tools/sim/Dockerfile.sim
@@ -9,26 +9,29 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN cd $HOME && \
     curl -O https://raw.githubusercontent.com/commaai/eon-neos-builder/master/devices/eon/home/.tmux.conf
 
-ENV PYTHONPATH $HOME/openpilot:${PYTHONPATH}
-RUN mkdir -p $HOME/openpilot
-
-COPY SConstruct $HOME/openpilot/
-
-COPY ./openpilot $HOME/openpilot/openpilot
-COPY ./body $HOME/openpilot/body
-COPY ./third_party $HOME/openpilot/third_party
-COPY ./site_scons $HOME/openpilot/site_scons
-COPY ./rednose $HOME/openpilot/rednose
-COPY ./laika $HOME/openpilot/laika
-COPY ./common $HOME/openpilot/common
-COPY ./opendbc $HOME/openpilot/opendbc
-COPY ./cereal $HOME/openpilot/cereal
-COPY ./panda $HOME/openpilot/panda
-COPY ./selfdrive $HOME/openpilot/selfdrive
-COPY ./system $HOME/openpilot/system
-COPY ./tools $HOME/openpilot/tools
-
-WORKDIR $HOME/openpilot
-RUN --mount=type=bind,source=.ci_cache/scons_cache,target=/tmp/scons_cache,rw scons -j$(nproc)
+ENV OPENPILOT_PATH /tmp/openpilot
+ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
+
+RUN mkdir -p ${OPENPILOT_PATH}
+WORKDIR ${OPENPILOT_PATH}
+
+COPY SConstruct ${OPENPILOT_PATH}
+
+COPY ./openpilot ${OPENPILOT_PATH}/openpilot
+COPY ./body ${OPENPILOT_PATH}/body
+COPY ./third_party ${OPENPILOT_PATH}/third_party
+COPY ./site_scons ${OPENPILOT_PATH}/site_scons
+COPY ./rednose ${OPENPILOT_PATH}/rednose
+COPY ./laika_repo ${OPENPILOT_PATH}/laika_repo
+RUN ln -s ${OPENPILOT_PATH}/laika_repo ${OPENPILOT_PATH}/laika
+COPY ./common ${OPENPILOT_PATH}/common
+COPY ./opendbc ${OPENPILOT_PATH}/opendbc
+COPY ./cereal ${OPENPILOT_PATH}/cereal
+COPY ./panda ${OPENPILOT_PATH}/panda
+COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
+COPY ./system ${OPENPILOT_PATH}/system
+COPY ./tools ${OPENPILOT_PATH}/tools
+
+RUN --mount=type=bind,source=.ci_cache/scons_cache,target=/tmp/scons_cache,rw scons -j$(nproc) --cache-readonly
 
 RUN python -c "from openpilot.selfdrive.test.helpers import set_params_enabled; set_params_enabled()"