openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove building of pam+noaudit and place in copr instead"

Browse Source
This commit is contained in:
Jenkins 2015-04-07 14:53:52 +00:00 committed by Gerrit Code Review
commit 5ea37557cf
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/centos-rdo-base/Dockerfile
View File

@ -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

12
docker/fedora-rdo-base/Dockerfile
View File

@ -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