diff --git a/murdock-worker/Dockerfile b/murdock-worker/Dockerfile index 02ef6aaf..39854142 100644 --- a/murdock-worker/Dockerfile +++ b/murdock-worker/Dockerfile @@ -29,10 +29,6 @@ RUN pip3 install hiredis # install testrunner dependencies RUN pip3 install click -# get git-cache-rs binary -COPY --from=ghcr.io/kaspar030/git-cache:0.1.5-jammy /git-cache /usr/bin/git-cache -ENV GIT_CACHE_RS /usr/bin/git-cache - # install newer ccache package ARG CCACHE_TGZ=ccache-4.7.4-linux-x86_64.tar.xz COPY files/${CCACHE_TGZ} / @@ -44,6 +40,9 @@ COPY murdock_slave.sh /usr/bin/murdock_slave # create cache folder RUN mkdir -m777 /cache +# remove old git-cache-rs files from before the directory structure changed +RUN rm -rf /cache/.gitcache/*.git /cache/.gitcache/*.lock + # set cache folder for Download Cache ENV DLCACHE_DIR /cache/.dlcache