Fix build.

This commit is contained in:
Alexis Lahouze 2018-11-26 00:24:07 +01:00
parent dbff2ebfcf
commit 10bab46b1c

View File

@ -8,14 +8,20 @@ RUN apt-get install -y --no-install-recommends \
# Install deps # Install deps
RUN pip install snakeoil RUN pip install snakeoil
RUN pip install git+https://github.com/dol-sen/pyDeComp #RUN pip install git+https://github.com/dol-sen/pyDeComp
RUN git clone https://github.com/dol-sen/pyDeComp pydecomp
WORKDIR pydecomp
RUN python -m setup bdist
#RUN python -m setup install
WORKDIR /
# Clone catalyst repository # Clone catalyst repository
RUN git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst RUN git clone https://anongit.gentoo.org/git/proj/catalyst.git catalyst
# Build and install catalyst # Build and install catalyst
WORKDIR /catalyst WORKDIR /catalyst
RUN make && python -m setup install RUN make && python -m setup bdist
# Get and uncompress shash # Get and uncompress shash
WORKDIR / WORKDIR /
@ -33,26 +39,13 @@ FROM python:3.6-alpine
RUN apk add coreutils RUN apk add coreutils
COPY --from=base /usr/local/lib/python3.6/site-packages/snakeoil-* \ RUN pip install snakeoil
/usr/local/lib/python3.6/site-packages/
COPY --from=base /usr/local/lib/python3.6/site-packages/snakeoil \
/usr/local/lib/python3.6/site-packages/snakeoil
COPY --from=base /usr/local/lib/python3.6/site-packages/DeComp-* \ COPY --from=base /pydecomp/dist/pyDeComp-*.tar.gz ./
/usr/local/lib/python3.6/site-packages/ RUN tar -xzf pyDeComp-*.tar.gz && rm pyDeComp-*.tar.gz
COPY --from=base /usr/local/lib/python3.6/site-packages/DeComp \
/usr/local/lib/python3.6/site-packages/DeComp
COPY --from=base /usr/local/lib/python3.6/site-packages/catalyst-* \ COPY --from=base /catalyst/dist/catalyst-*.tar.gz ./
/usr/local/lib/python3.6/site-packages/ RUN tar -xzf catalyst-*.tar.gz && rm catalyst-*.tar.gz
COPY --from=base /usr/local/lib/python3.6/site-packages/catalyst \
/usr/local/lib/python3.6/site-packages/catalyst
COPY --from=base /usr/local/share/catalyst /usr/local/share
COPY --from=base /etc/catalyst /etc/
COPY --from=base /usr/local/bin/catalyst /usr/local/bin/catalyst
COPY --from=base /usr/local/bin/shash /usr/local/bin/shash COPY --from=base /usr/local/bin/shash /usr/local/bin/shash