Convert tabs to spaces
Centos, increase to 4 space indents
This commit is contained in:
parent
ac88afe22f
commit
ca2af02151
|
@ -3,58 +3,58 @@ FROM centos:7
|
|||
ENV OPENSTACK_VERSION=newton
|
||||
|
||||
RUN set -x \
|
||||
# NOTE(Pete Birley): CentOS-OpenStack repo is only used for liberasurecode-devel
|
||||
&& curl -sSL https://raw.githubusercontent.com/rdo-infra/centos-release-openstack/${OPENSTACK_VERSION}-rdo/CentOS-OpenStack.repo > /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& sed -i "s/OPENSTACK_VERSION/${OPENSTACK_VERSION}/g" /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& sed -i "/\[centos-openstack-${OPENSTACK_VERSION}\]/s/.*/&\nincludepkgs=liberasurecode*/" /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& curl -sSL https://raw.githubusercontent.com/rdo-infra/centos-release-openstack/newton-rdo/RPM-GPG-KEY-CentOS-SIG-Cloud > /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud \
|
||||
# NOTE(Pete Birley): libffi-devel does not like being uninstalled on CentOS so we install it seperatly, all of its dependencies are already installed in the docker base image.
|
||||
&& yum install --setopt=tsflags=nodocs -y \
|
||||
libffi-devel \
|
||||
&& yum install --setopt=tsflags=nodocs -y \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
make \
|
||||
openssl-devel \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
bzip2 \
|
||||
liberasurecode-devel \
|
||||
openldap-devel \
|
||||
mariadb-devel \
|
||||
nss-devel \
|
||||
postgresql-devel \
|
||||
cyrus-sasl-devel \
|
||||
openssl-devel \
|
||||
libxml2-devel \
|
||||
libxslt-devel \
|
||||
libvirt-devel \
|
||||
libyaml-devel \
|
||||
zlib-devel \
|
||||
pkgconfig \
|
||||
python \
|
||||
python-devel \
|
||||
libgcrypt \
|
||||
nss-util \
|
||||
&& curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& mkdir /root/packages \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/global-requirements.txt > /root/packages/global-requirements.txt \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt > /root/packages/upper-constraints.txt \
|
||||
# NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
|
||||
&& sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
|
||||
&& pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
|
||||
&& mkdir /tmp/python-nss \
|
||||
&& tar xvf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
|
||||
&& sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
|
||||
&& pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
|
||||
# NOTE(SamYaple): end bug workaround
|
||||
# NOTE(Pete Birley): spec-cleaner 0.9.1 requires a newer version of re than comes with Python 2.7.5. https://bugs.launchpad.net/openstack-requirements/+bug/1655509
|
||||
&& sed -i "s/spec-cleaner===0.9.1/spec-cleaner===0.9.0/" /root/packages/upper-constraints.txt \
|
||||
# NOTE(Pete Birley): end bug workaround
|
||||
&& pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
|
||||
&& yum history -y undo $(yum history list gcc | tail -2 | head -1 | awk '{ print $1}') \
|
||||
&& yum clean all \
|
||||
&& rm -rf /tmp/* /root/.cache
|
||||
# NOTE(Pete Birley): CentOS-OpenStack repo is only used for liberasurecode-devel
|
||||
&& curl -sSL https://raw.githubusercontent.com/rdo-infra/centos-release-openstack/${OPENSTACK_VERSION}-rdo/CentOS-OpenStack.repo > /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& sed -i "s/OPENSTACK_VERSION/${OPENSTACK_VERSION}/g" /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& sed -i "/\[centos-openstack-${OPENSTACK_VERSION}\]/s/.*/&\nincludepkgs=liberasurecode*/" /etc/yum.repos.d/CentOS-OpenStack.repo \
|
||||
&& curl -sSL https://raw.githubusercontent.com/rdo-infra/centos-release-openstack/newton-rdo/RPM-GPG-KEY-CentOS-SIG-Cloud > /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud \
|
||||
# NOTE(Pete Birley): libffi-devel does not like being uninstalled on CentOS so we install it seperatly, all of its dependencies are already installed in the docker base image.
|
||||
&& yum install --setopt=tsflags=nodocs -y \
|
||||
libffi-devel \
|
||||
&& yum install --setopt=tsflags=nodocs -y \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
make \
|
||||
openssl-devel \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
bzip2 \
|
||||
liberasurecode-devel \
|
||||
openldap-devel \
|
||||
mariadb-devel \
|
||||
nss-devel \
|
||||
postgresql-devel \
|
||||
cyrus-sasl-devel \
|
||||
openssl-devel \
|
||||
libxml2-devel \
|
||||
libxslt-devel \
|
||||
libvirt-devel \
|
||||
libyaml-devel \
|
||||
zlib-devel \
|
||||
pkgconfig \
|
||||
python \
|
||||
python-devel \
|
||||
libgcrypt \
|
||||
nss-util \
|
||||
&& curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& mkdir /root/packages \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/global-requirements.txt > /root/packages/global-requirements.txt \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt > /root/packages/upper-constraints.txt \
|
||||
# NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
|
||||
&& sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
|
||||
&& pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
|
||||
&& mkdir /tmp/python-nss \
|
||||
&& tar xf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
|
||||
&& sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
|
||||
&& pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
|
||||
# NOTE(SamYaple): end bug workaround
|
||||
# NOTE(Pete Birley): spec-cleaner 0.9.1 requires a newer version of re than comes with Python 2.7.5. https://bugs.launchpad.net/openstack-requirements/+bug/1655509
|
||||
&& sed -i "s/spec-cleaner===0.9.1/spec-cleaner===0.9.0/" /root/packages/upper-constraints.txt \
|
||||
# NOTE(Pete Birley): end bug workaround
|
||||
&& pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
|
||||
&& yum history -y undo $(yum history list gcc | tail -2 | head -1 | awk '{ print $1}') \
|
||||
&& yum clean all \
|
||||
&& rm -rf /tmp/* /root/.cache
|
||||
|
|
|
@ -1,63 +1,63 @@
|
|||
FROM debian:jessie
|
||||
|
||||
RUN set -x \
|
||||
# NOTE(SamYaple): backports is only used for liberasurecode-dev
|
||||
&& echo "deb http://deb.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python \
|
||||
python-dev \
|
||||
&& curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& mkdir /root/packages \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/global-requirements.txt > /root/packages/global-requirements.txt \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt > /root/packages/upper-constraints.txt \
|
||||
# NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
|
||||
&& sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
|
||||
&& pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
|
||||
&& mkdir /tmp/python-nss \
|
||||
&& tar xvf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
|
||||
&& sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
|
||||
&& pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
|
||||
# NOTE(SamYaple): end bug workaround
|
||||
&& pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
|
||||
&& apt-get purge -y --auto-remove \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python-dev \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /root/.cache
|
||||
# NOTE(SamYaple): backports is only used for liberasurecode-dev
|
||||
&& echo "deb http://deb.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python \
|
||||
python-dev \
|
||||
&& curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& mkdir /root/packages \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/global-requirements.txt > /root/packages/global-requirements.txt \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt > /root/packages/upper-constraints.txt \
|
||||
# NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
|
||||
&& sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
|
||||
&& pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
|
||||
&& mkdir /tmp/python-nss \
|
||||
&& tar xf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
|
||||
&& sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
|
||||
&& pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
|
||||
# NOTE(SamYaple): end bug workaround
|
||||
&& pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
|
||||
&& apt-get purge -y --auto-remove \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python-dev \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /root/.cache
|
||||
|
|
|
@ -1,61 +1,61 @@
|
|||
FROM ubuntu:xenial
|
||||
|
||||
RUN set -x \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python \
|
||||
python-dev \
|
||||
&& curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& mkdir /root/packages \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/global-requirements.txt > /root/packages/global-requirements.txt \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt > /root/packages/upper-constraints.txt \
|
||||
# NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
|
||||
&& sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
|
||||
&& pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
|
||||
&& mkdir /tmp/python-nss \
|
||||
&& tar xvf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
|
||||
&& sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
|
||||
&& pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
|
||||
# NOTE(SamYaple): end bug workaround
|
||||
&& pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
|
||||
&& apt-get purge -y --auto-remove \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python-dev \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /root/.cache
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python \
|
||||
python-dev \
|
||||
&& curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||
&& python get-pip.py \
|
||||
&& rm get-pip.py \
|
||||
&& mkdir /root/packages \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/global-requirements.txt > /root/packages/global-requirements.txt \
|
||||
&& curl -sSL https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt > /root/packages/upper-constraints.txt \
|
||||
# NOTE(SamYaple): There is a bug with python-nss, this is a workaround. https://bugzilla.redhat.com/show_bug.cgi?id=1389739
|
||||
&& sed -i '/dogtag-pki/d' /root/packages/global-requirements.txt \
|
||||
&& pip download -d /tmp -c /root/packages/upper-constraints.txt python-nss \
|
||||
&& mkdir /tmp/python-nss \
|
||||
&& tar xf /tmp/python-nss-*.tar.bz2 -C /tmp/python-nss --strip-components=1 \
|
||||
&& sed -i "s/if arg in ('-d', '--debug'):/if arg == '--debug':/g" /tmp/python-nss/setup.py \
|
||||
&& pip wheel -w /root/packages/ $(grep dogtag-pki /root/packages/upper-constraints.txt) /tmp/python-nss/ \
|
||||
# NOTE(SamYaple): end bug workaround
|
||||
&& pip wheel -w /root/packages/ -r /root/packages/global-requirements.txt -c /root/packages/upper-constraints.txt \
|
||||
&& apt-get purge -y --auto-remove \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
curl \
|
||||
git \
|
||||
liberasurecode-dev \
|
||||
libffi-dev \
|
||||
libldap2-dev \
|
||||
libmysqlclient-dev \
|
||||
libnss3-dev \
|
||||
libpq-dev \
|
||||
libsasl2-dev \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxslt1-dev \
|
||||
libvirt-dev \
|
||||
libyaml-dev \
|
||||
libz-dev \
|
||||
pkg-config \
|
||||
python-dev \
|
||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /root/.cache
|
||||
|
|
Loading…
Reference in New Issue