From 5bd37e1da30dfc76df6fead3fa901bcee9a1b886 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Wed, 11 Dec 2024 12:33:51 -0500 Subject: [PATCH 1/4] Dockerfile: point to sunnypilot/opendbc --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68362f8cfd..d1dc3ab3e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,9 +37,9 @@ RUN pip3 install --break-system-packages --no-cache-dir $PYTHONPATH/panda/[dev] # TODO: this should be a "pip install" or not even in this repo at all RUN git config --global --add safe.directory $PYTHONPATH/panda -ENV OPENDBC_REF="e1ce3619a5db661ef2b406ccf258a253baf6eebc" +ENV OPENDBC_REF="378967043dd72d29bb3f1207ac015fcc5e740451" RUN cd /tmp/ && \ - git clone --depth 1 https://github.com/commaai/opendbc opendbc_repo && \ + git clone --depth 1 https://github.com/sunnypilot/opendbc opendbc_repo && \ cd opendbc_repo && git fetch origin $OPENDBC_REF && git checkout FETCH_HEAD && rm -rf .git/ && \ pip3 install --break-system-packages --no-cache-dir Cython numpy && \ scons -j8 --minimal opendbc/ && \ From 7ea27b53c8f3b1e37677c1ce9498229fceac9de6 Mon Sep 17 00:00:00 2001 From: DevTekVE Date: Wed, 11 Dec 2024 19:15:47 +0100 Subject: [PATCH 2/4] Happy days :) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1dc3ab3e8..c90e9232bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN pip3 install --break-system-packages --no-cache-dir $PYTHONPATH/panda/[dev] # TODO: this should be a "pip install" or not even in this repo at all RUN git config --global --add safe.directory $PYTHONPATH/panda -ENV OPENDBC_REF="378967043dd72d29bb3f1207ac015fcc5e740451" +ENV OPENDBC_REF="a532dbd03230cea03548aa92b3c50508829abd85" RUN cd /tmp/ && \ git clone --depth 1 https://github.com/sunnypilot/opendbc opendbc_repo && \ cd opendbc_repo && git fetch origin $OPENDBC_REF && git checkout FETCH_HEAD && rm -rf .git/ && \ From 6cf78ec38548b20c959c8daaab91f2a334cce6ec Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Wed, 11 Dec 2024 14:01:54 -0500 Subject: [PATCH 3/4] Revert "Happy days :)" This reverts commit 7ea27b53c8f3b1e37677c1ce9498229fceac9de6. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c90e9232bf..d1dc3ab3e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN pip3 install --break-system-packages --no-cache-dir $PYTHONPATH/panda/[dev] # TODO: this should be a "pip install" or not even in this repo at all RUN git config --global --add safe.directory $PYTHONPATH/panda -ENV OPENDBC_REF="a532dbd03230cea03548aa92b3c50508829abd85" +ENV OPENDBC_REF="378967043dd72d29bb3f1207ac015fcc5e740451" RUN cd /tmp/ && \ git clone --depth 1 https://github.com/sunnypilot/opendbc opendbc_repo && \ cd opendbc_repo && git fetch origin $OPENDBC_REF && git checkout FETCH_HEAD && rm -rf .git/ && \ From 047d47fab13b6183ade1e4ffbb07729ca3001c95 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Wed, 11 Dec 2024 14:02:19 -0500 Subject: [PATCH 4/4] symlink prior building --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d1dc3ab3e8..49039197bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,8 +42,8 @@ RUN cd /tmp/ && \ git clone --depth 1 https://github.com/sunnypilot/opendbc opendbc_repo && \ cd opendbc_repo && git fetch origin $OPENDBC_REF && git checkout FETCH_HEAD && rm -rf .git/ && \ pip3 install --break-system-packages --no-cache-dir Cython numpy && \ - scons -j8 --minimal opendbc/ && \ - ln -s $PWD/opendbc $PYTHONPATH/opendbc + ln -s $PWD/opendbc $PYTHONPATH/opendbc && \ + scons -j8 --minimal opendbc/ # for Jenkins COPY README.md panda.tar.* /tmp/