ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert the multi-stage changes.

Browse Source 
It doesn't save much space.
It greatly complicates the Dockerfile.
It breaks the `upcoming-deprecations` job unless even more pains are taken.
This commit is contained in:
Jean-Paul Calderone 2019-04-07 11:10:15 -04:00
parent de9d7082ea
commit fbea42c8db
1 changed files with 11 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.circleci/Dockerfile.debian
View File

@ -1,5 +1,5 @@
ARG TAG
FROM debian:${TAG} as builder
FROM debian:${TAG}
ENV WHEELHOUSE_PATH /tmp/wheelhouse
ENV VIRTUALENV_PATH /tmp/venv
@ -8,54 +8,24 @@ ENV BUILD_SRC_ROOT /tmp/project
RUN apt-get --quiet update && \
apt-get --quiet --yes install \
git \
git \
lsb-release \
sudo \
build-essential \
python2.7 \
python2.7-dev \
libffi-dev \
libssl-dev \
libyaml-dev \
virtualenv
build-essential \
python2.7 \
python2.7-dev \
libffi-dev \
libssl-dev \
libyaml-dev \
virtualenv
# Get the project source. This is better than it seems. CircleCI will
# *update* this checkout on each job run, saving us more time per-job.
COPY . ${BUILD_SRC_ROOT}
RUN "${BUILD_SRC_ROOT}"/.circleci/fix-permissions.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
FROM debian:${TAG}
# Yea, we get to specify all of these a second time!
ENV WHEELHOUSE_PATH /tmp/wheelhouse
ENV VIRTUALENV_PATH /tmp/venv
ENV BUILD_SRC_ROOT /tmp/project
# Install just the runtime dependencies of Tahoe-LAFS
RUN apt-get --quiet update && \
apt-get --quiet --yes install \
git \
python2.7 \
libffi6 \
libssl1.1 \
libyaml-0-2 \
virtualenv && \
rm -rf /var/lib/apt/lists/*
COPY --from=builder ${VIRTUALENV_PATH} ${VIRTUALENV_PATH}
COPY --from=builder ${BUILD_SRC_ROOT} ${BUILD_SRC_ROOT}
COPY --from=builder ${WHEELHOUSE_PATH} ${WHEELHOUSE_PATH}
RUN "${BUILD_SRC_ROOT}"/.circleci/fix-permissions.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
# Only the integration tests currently need this but it doesn't hurt to always
# have it present and it's simpler than building a whole extra image just for
# the integration tests.
RUN apt-get --quiet update && \
apt-get --yes install lsb-release gnupg2 && \
${BUILD_SRC_ROOT}/integration/install-tor.sh && \
apt-get --yes remove lsb-release gnupg2 && \
apt-get --yes autoremove && \
rm -rf /var/lib/apt/lists/*
RUN ${BUILD_SRC_ROOT}/integration/install-tor.sh