diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-07 14:53:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-07 14:53:52 +0000 |
| commit | 5ea37557cf1d5600e0bb141e010a4bcdbd967162 (patch) | |
| tree | d6c832a2b017df861c5cbc96733fba4d71edc5a0 /docker | |
| parent | 7a29958949f04269956172817ca9ed39d1fb3802 (diff) | |
| parent | f4506ddd60de14e368b2f3599715369738766dd5 (diff) | |
| download | kolla-5ea37557cf1d5600e0bb141e010a4bcdbd967162.tar.gz kolla-5ea37557cf1d5600e0bb141e010a4bcdbd967162.zip | |
Merge "Remove building of pam+noaudit and place in copr instead"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/centos-rdo-base/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/fedora-rdo-base/Dockerfile | 12 |
2 files changed, 16 insertions, 10 deletions
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index 44e26af52..5fa7ab1ab 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -4,6 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-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 # CentOS 7.1 workaround @@ -96,21 +97,14 @@ RUN yum install -y \ python-wsme \ && yum clean all -# This is dirty like zebra. This works aorund a bug in Ubuntu 14.04 LTS. The +# This is dirty like zebra. This works around a bug in Ubuntu 14.04 LTS. The # --net=host option does not work on ubuntu 14.04 because of a kernel bug. One # workaround is to buid pam without authentication. # See: # https://registry.hub.docker.com/u/sequenceiq/pam/ # -RUN yum install -y tar bzip2 yum-utils rpm-build make - -RUN yum-builddep -y pam -RUN yumdownloader --source pam -RUN rpmbuild --rebuild --define 'WITH_AUDIT 0' --define 'dist +noaudit' pam*.src.rpm -RUN rpm -Uvh --oldpackage ~/rpmbuild/RPMS/*/pam*+noaudit*.rpm - -RUN rm -f /*.rpm -RUN rm -rf ~/rpmbuild +RUN rpm -e --nodeps pam +RUN yum -y install pam+noaudit && yum clean all # End dirty like zebra RUN mkdir -p /opt/kolla diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile index a6f2400ff..f41cac97e 100644 --- a/docker/fedora-rdo-base/Dockerfile +++ b/docker/fedora-rdo-base/Dockerfile @@ -5,6 +5,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm RUN yum -y install dnf dnf-plugins-core && yum clean all RUN dnf copr enable -y larsks/crux +run dnf copr enable -y sdake/pam.noaudit + # Update packages RUN yum update -y && yum clean all @@ -91,6 +93,16 @@ RUN yum install -y \ python-wsme \ && yum clean all +# This is dirty like zebra. This works around a bug in Ubuntu 14.04 LTS. The +# --net=host option does not work on ubuntu 14.04 because of a kernel bug. One +# workaround is to build pam without authentication. +# See: +# https://registry.hub.docker.com/u/sequenceiq/pam/ +# +RUN rpm -e --nodeps pam +RUN yum -y install pam+noaudit && yum clean all +# End dirty like zebra + RUN mkdir -p /opt/kolla ADD service_hosts.sh /opt/kolla/service_hosts.sh ADD kolla-common.sh /opt/kolla/kolla-common.sh |