Remove crux from base Dockerfiles
With blueprint remove-config-internal we no longer require crux. Removing it from base images Dockerfiles Partially implements: blueprint remove-config-internal Change-Id: Iccddaf41945a69e78978288dc2012299b21bc9a9
This commit is contained in:
parent
0b63b64d05
commit
67c3c6b28a
@ -6,8 +6,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
|||||||
RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm
|
RUN yum install -y https://rdoproject.org/repos/openstack-kilo/rdo-release-kilo.rpm
|
||||||
# This repository provides latest packages built from trunk master into RPMs
|
# This repository provides latest packages built from trunk master into RPMs
|
||||||
RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo
|
RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean-current.repo
|
||||||
# This repository provides crux which permits idempotent operation of RDO
|
|
||||||
RUN curl https://copr.fedoraproject.org/coprs/sdake/crux/repo/epel-7/sdake-crux-epel-7.repo -o /etc/yum.repos.d/sdake-crux-epel-7.repo
|
|
||||||
# This repository turns off auth in PAM so we can operate on Ubuntu 14.04
|
# This repository turns off auth in PAM so we can operate on Ubuntu 14.04
|
||||||
RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo
|
RUN curl https://copr.fedoraproject.org/coprs/sdake/pam.noaudit/repo/epel-7/sdake-pam.noaudit-epel-7.repo -o /etc/yum.repos.d/sdake-pam.noaudit-epel-7.repo
|
||||||
|
|
||||||
@ -23,7 +21,6 @@ RUN yum update -y && yum clean all
|
|||||||
|
|
||||||
# Install base packages
|
# Install base packages
|
||||||
RUN yum install -y \
|
RUN yum install -y \
|
||||||
crux \
|
|
||||||
mariadb \
|
mariadb \
|
||||||
mariadb-libs \
|
mariadb-libs \
|
||||||
openssl \
|
openssl \
|
||||||
|
@ -31,7 +31,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
|||||||
RUN pip install --upgrade \
|
RUN pip install --upgrade \
|
||||||
cachetools \
|
cachetools \
|
||||||
crudini \
|
crudini \
|
||||||
crux \
|
|
||||||
pip \
|
pip \
|
||||||
tox
|
tox
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
|||||||
# Set up repositories
|
# Set up repositories
|
||||||
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
|
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
|
||||||
RUN yum -y install dnf dnf-plugins-core && yum clean all
|
RUN yum -y install dnf dnf-plugins-core && yum clean all
|
||||||
RUN dnf copr enable -y sdake/crux
|
|
||||||
RUN dnf copr enable -y sdake/pam.noaudit
|
RUN dnf copr enable -y sdake/pam.noaudit
|
||||||
|
|
||||||
|
|
||||||
@ -14,7 +13,6 @@ RUN yum update -y && yum clean all
|
|||||||
# Install base packages
|
# Install base packages
|
||||||
RUN yum install -y \
|
RUN yum install -y \
|
||||||
iproute \
|
iproute \
|
||||||
crux \
|
|
||||||
mariadb \
|
mariadb \
|
||||||
mariadb-libs \
|
mariadb-libs \
|
||||||
openssl \
|
openssl \
|
||||||
|
@ -1,13 +1,8 @@
|
|||||||
FROM fedora:21
|
FROM fedora:21
|
||||||
MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
MAINTAINER Kolla Project (https://launchpad.net/kolla)
|
||||||
|
|
||||||
# This repository provides crux which permits idempotent operation of RDO
|
|
||||||
RUN curl https://copr.fedoraproject.org/coprs/sdake/crux/repo/epel-7/sdake-crux-epel-7.repo -o \
|
|
||||||
/etc/yum.repos.d/sdake-crux-epel-7.repo
|
|
||||||
|
|
||||||
# Dependencies required for building/installing source components
|
# Dependencies required for building/installing source components
|
||||||
RUN yum install -y \
|
RUN yum install -y \
|
||||||
crux \
|
|
||||||
gcc \
|
gcc \
|
||||||
git \
|
git \
|
||||||
libffi-devel \
|
libffi-devel \
|
||||||
@ -30,7 +25,7 @@ RUN yum install -y \
|
|||||||
|
|
||||||
|
|
||||||
# the only dependencies we need from RDO in the source builds are
|
# the only dependencies we need from RDO in the source builds are
|
||||||
# python-pip, python-cliff for crux, and crudini,
|
# python-pip, python-cliff for crudini,
|
||||||
# all of which can be pulled from pypi.
|
# all of which can be pulled from pypi.
|
||||||
# also the older version of pip does not have support for wheels
|
# also the older version of pip does not have support for wheels
|
||||||
# we are installing from source pip is the important for
|
# we are installing from source pip is the important for
|
||||||
|
@ -14,7 +14,7 @@ RUN yum install -y \
|
|||||||
tar \
|
tar \
|
||||||
&& yum clean all
|
&& yum clean all
|
||||||
|
|
||||||
# TODO(pbourke): replace pip and crux below with rpms once available in Oracle
|
# TODO(pbourke): replace pip below with rpms once available in Oracle
|
||||||
# repos
|
# repos
|
||||||
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
||||||
&& python get-pip.py \
|
&& python get-pip.py \
|
||||||
@ -22,10 +22,4 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
|||||||
|
|
||||||
RUN pip install crudini
|
RUN pip install crudini
|
||||||
|
|
||||||
RUN curl https://codeload.github.com/larsks/crux/tar.gz/7 -o /crux-7.tar.gz \
|
|
||||||
&& tar -xf /crux-7.tar.gz \
|
|
||||||
&& pip install -r /crux-7/requirements.txt \
|
|
||||||
&& pip install /crux-7 \
|
|
||||||
&& rm -rf /crux-7.tar.gz /crux-7
|
|
||||||
|
|
||||||
COPY kolla-common.sh /opt/kolla/
|
COPY kolla-common.sh /opt/kolla/
|
||||||
|
@ -33,7 +33,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
|
|||||||
RUN pip install --upgrade \
|
RUN pip install --upgrade \
|
||||||
cachetools \
|
cachetools \
|
||||||
crudini \
|
crudini \
|
||||||
crux \
|
|
||||||
pip \
|
pip \
|
||||||
tox
|
tox
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user