Apply the various changes to the 3 other Debian-alikes

This commit is contained in:
Jean-Paul Calderone 2019-04-04 13:12:29 -04:00
parent 4d15504e4a
commit 08693e79f8
3 changed files with 33 additions and 2 deletions

View File

@ -1,5 +1,10 @@
FROM debian:9 FROM debian:9
ENV WHEELHOUSE_PATH /tmp/wheelhouse
ENV VIRTUALENV_PATH /tmp/venv
# This will get updated by the CircleCI checkout step.
ENV BUILD_SRC_ROOT /tmp/project
RUN apt-get --quiet update && \ RUN apt-get --quiet update && \
apt-get --quiet --yes install git && \ apt-get --quiet --yes install git && \
apt-get --quiet --yes install \ apt-get --quiet --yes install \
@ -11,3 +16,9 @@ RUN apt-get --quiet update && \
libssl-dev \ libssl-dev \
libyaml-dev \ libyaml-dev \
virtualenv virtualenv
# Get the project source. Copying in the whole project source here isn't very
# cache friendly but there's no Docker layer cache on CircleCI anyway!
COPY . ${BUILD_SRC_ROOT}
RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"

View File

@ -1,8 +1,12 @@
FROM ubuntu:16.04 FROM ubuntu:16.04
ENV WHEELHOUSE_PATH /tmp/wheelhouse
ENV VIRTUALENV_PATH /tmp/venv
# This will get updated by the CircleCI checkout step.
ENV BUILD_SRC_ROOT /tmp/project
# language-pack-en included to support the en_US LANG setting. # language-pack-en included to support the en_US LANG setting.
# iproute2 necessary for automatic address detection/assignment. # iproute2 necessary for automatic address detection/assignment.
RUN apt-get --quiet update && \ RUN apt-get --quiet update && \
apt-get --quiet --yes install git && \ apt-get --quiet --yes install git && \
apt-get --quiet --yes install \ apt-get --quiet --yes install \
@ -16,3 +20,9 @@ RUN apt-get --quiet update && \
virtualenv \ virtualenv \
language-pack-en \ language-pack-en \
iproute2 iproute2
# Get the project source. Copying in the whole project source here isn't very
# cache friendly but there's no Docker layer cache on CircleCI anyway!
COPY . ${BUILD_SRC_ROOT}
RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"

View File

@ -1,8 +1,12 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
ENV WHEELHOUSE_PATH /tmp/wheelhouse
ENV VIRTUALENV_PATH /tmp/venv
# This will get updated by the CircleCI checkout step.
ENV BUILD_SRC_ROOT /tmp/project
# language-pack-en included to support the en_US LANG setting. # language-pack-en included to support the en_US LANG setting.
# iproute2 necessary for automatic address detection/assignment. # iproute2 necessary for automatic address detection/assignment.
RUN apt-get --quiet update && \ RUN apt-get --quiet update && \
apt-get --quiet --yes install git && \ apt-get --quiet --yes install git && \
apt-get --quiet --yes install \ apt-get --quiet --yes install \
@ -16,3 +20,9 @@ RUN apt-get --quiet update && \
virtualenv \ virtualenv \
language-pack-en \ language-pack-en \
iproute2 iproute2
# Get the project source. Copying in the whole project source here isn't very
# cache friendly but there's no Docker layer cache on CircleCI anyway!
COPY . ${BUILD_SRC_ROOT}
RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"