From e99a0fc2c6e624ddbb51fdd11ae66553dba9f8df Mon Sep 17 00:00:00 2001 From: Alexis Lahouze Date: Mon, 26 Nov 2018 09:08:25 +0100 Subject: [PATCH] Fix python module extraction. --- Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1013e0..1ddc2c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ WORKDIR snakeoil RUN python -m setup bdist WORKDIR / -RUN tar xvzf snakeoil/dist/snakeoil-*.tar.gz +RUN tar xvzf snakeoil/dist/snakeoil-*.tar.gz --transform 's/usr\/local/usr' # Build and install pyDeComp RUN git clone https://github.com/dol-sen/pyDeComp pydecomp @@ -21,7 +21,7 @@ WORKDIR pydecomp RUN python -m setup bdist WORKDIR / -RUN tar xvzf pydecomp/dist/pyDeComp-*.tar.gz +RUN tar xvzf pydecomp/dist/pyDeComp-*.tar.gz --transform 's/usr\/local/usr' # Clone catalyst repository RUN git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst @@ -53,14 +53,16 @@ RUN apt-get update \ #RUN apk add coreutils COPY --from=base /snakeoil/dist/snakeoil-*.tar.gz ./ -RUN tar xvzf snakeoil-*.tar.gz && rm snakeoil-*.tar.gz +RUN tar xvzf snakeoil-*.tar.gz --transform 's/usr\/local/usr' \ + && rm snakeoil-*.tar.gz COPY --from=base /pydecomp/dist/pyDeComp-*.tar.gz ./ -RUN tar xvzf pyDeComp-*.tar.gz && rm pyDeComp-*.tar.gz +RUN tar xvzf pyDeComp-*.tar.gz --transform 's/usr\/local/usr' \ + && rm pyDeComp-*.tar.gz COPY --from=base /catalyst/dist/catalyst-*.tar.gz ./ -RUN tar xvzf catalyst-*.tar.gz && rm catalyst-*.tar.gz \ - --transform 's/usr\/local/usr' +RUN tar xvzf catalyst-*.tar.gz --transform 's/usr\/local/usr' + && rm catalyst-*.tar.gz \ COPY --from=base /usr/local/bin/shash /usr/local/bin/shash