diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile index a0ce5248bb1e1b2d119a942ed734ee683adffe6a..030d751c8b4976b83fcadc7f4ab3ddc3a18e2575 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 68a20c6d6b69c3cb5fad6dbf16493c5f59b6d8d3..98dffd4de603e460e6ddefebe5c0cd67179c7f71 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`.