From 13f12227bd8dd4b628c7ec85263840accd5e723a Mon Sep 17 00:00:00 2001 From: "E.T" Date: Tue, 30 Jan 2024 21:32:01 +0100 Subject: [PATCH] Remove ccache hack from dockerfiles (#1835) Now we have a proper solution in cmake --- dockerfile-nogit | 7 ------- dockerfile-nogit-alpine | 4 ---- dockerfile-nogit-arm | 7 ------- 3 files changed, 18 deletions(-) diff --git a/dockerfile-nogit b/dockerfile-nogit index 1062e227..d2f5f84d 100644 --- a/dockerfile-nogit +++ b/dockerfile-nogit @@ -35,13 +35,6 @@ RUN mkdir /opt/build \ && mkdir armbin \ && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin -# Configure CCACHE -RUN mkdir ~/bin \ - && cd ~/bin \ - && for tool in gcc g++ cpp c++; do \ - ln -s $(which ccache) arm-none-eabi-$tool \ - ; done - ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/dockerfile-nogit-alpine b/dockerfile-nogit-alpine index 6c2f69cb..2392b4b9 100644 --- a/dockerfile-nogit-alpine +++ b/dockerfile-nogit-alpine @@ -19,9 +19,5 @@ RUN apk add --no-cache g++ gcc clang clang-static clang-dev llvm-dev llvm-static ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 -# Configure CCACHE -RUN mkdir ~/bin && cd ~/bin && \ - for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done - CMD cd .. && cd build && \ cmake .. && make ppfw diff --git a/dockerfile-nogit-arm b/dockerfile-nogit-arm index 0a7a4fe2..b5431ade 100644 --- a/dockerfile-nogit-arm +++ b/dockerfile-nogit-arm @@ -35,13 +35,6 @@ RUN mkdir /opt/build \ && mkdir armbin \ && tar --strip=1 -xjvf gcc-arm-none-eabi -C armbin -# Configure CCACHE -RUN mkdir ~/bin \ - && cd ~/bin \ - && for tool in gcc g++ cpp c++; do \ - ln -s $(which ccache) arm-none-eabi-$tool \ - ; done - ADD firmware/tools/docker-entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]