From afcc1569b8fe3f962ad13bd0ed780c3336163fd3 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 26 Mar 2015 11:49:06 -0700 Subject: [PATCH] Work around Ubuntu 14.04 Kernel bug with --net=host This patch builds pam with no auditing. This allows the images to operate on Ubuntu 14.04 which contain a kernel bug and have not been updated. Change-Id: I2b8bd192abcc26df27ca276dc3d0fde377048f20 --- docker/centos-rdo-base/Dockerfile | 17 +++++++++++++++++ docs/developer-env.md | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index a0ce5248bb..030d751c8b 100644 --- a/docker/centos-rdo-base/Dockerfile +++ b/docker/centos-rdo-base/Dockerfile @@ -92,6 +92,23 @@ 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 +# --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 +# 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 diff --git a/docs/developer-env.md b/docs/developer-env.md index 68a20c6d6b..98dffd4de6 100644 --- a/docs/developer-env.md +++ b/docs/developer-env.md @@ -48,10 +48,10 @@ running on your system, stop it: sudo systemctl stop docker sudo killall -9 docker -Next, download and run the Docker 1.6 LKCD4 (Docker Inc Employee) built binary: +Next, download and run the Docker 1.6 lk4d4 (Docker Inc Employee) built binary: - Login to dropbox and download https://www.dropbox.com/s/r6cbxtw1dqa3kzh/docker-1.6.0-rc1?dl=0 - mv docker-1.6.-rc1 docker + Login to dropbox and download https://www.dropbox.com/s/vyz79t4r7nicltc/docker-1.6.0-rc2?dl=0 + mv docker-1.6.-rc2 docker sudo ./docker -d & The basic starting environment will be created using `docker-compose`.