Skip to content

Commit

Permalink
Merge pull request #240 from kaspar030/add_git-cache-rs
Browse files Browse the repository at this point in the history
murdock-worker: get git-cache-rs, bump dwq to version that supports it
  • Loading branch information
kaspar030 authored Jan 31, 2024
2 parents d402119 + 67c595b commit 9fc1ba4
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions murdock-worker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# install dwq (disque work queue)
RUN pip3 install dwq==0.0.60
RUN pip3 install dwq==0.1.0

# install hiredis -- not required directly, but redis (from dwq) will spew
# warnings otherwise that break things somewhere further down the line.
Expand All @@ -29,10 +29,9 @@ RUN pip3 install hiredis
# install testrunner dependencies
RUN pip3 install click

# get git-cache directly from github
RUN wget https://raw.githubusercontent.com/kaspar030/git-cache/f76c3a5f0e15f08c28e53fb037755f29f0b76d88/git-cache \
-O /usr/bin/git-cache \
&& chmod a+x /usr/bin/git-cache
# get git-cache-rs binary
COPY --from=ghcr.io/kaspar030/git-cache:0.1.3-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
Expand Down

0 comments on commit 9fc1ba4

Please sign in to comment.