Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity

Fixes a problem in PAM which may cause chpasswd and related tools to fail

Browse Source 
This is caused by Docker bug 6345 which is already closed, but for some
reason the problem still persists. Closes GH-181. Patch contributed
by Michael Zedeler.
This commit is contained in:
Hongli Lai (Phusion)
2016-07-08 19:59:20 +02:00
parent 6d5518974f
commit 3edd5d1564
3 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@@ -2,6 +2,7 @@
* Upgraded to Ubuntu 16.04. Thanks to Pierre Jacomet for submitting this patch. * Upgraded to Ubuntu 16.04. Thanks to Pierre Jacomet for submitting this patch.
* During shutdown, repeatedly tell Runit to shutdown services in order to workaround a potential race condition in Runit itself. Closes GH-315. Thanks to Chris Kite for submitting this patch. * During shutdown, repeatedly tell Runit to shutdown services in order to workaround a potential race condition in Runit itself. Closes GH-315. Thanks to Chris Kite for submitting this patch.
* Fixes a problem in PAM which may cause chpasswd and related tools to fail. This is caused by Docker bug 6345 which is already closed, but for some reason the problem still persists. Closes GH-181. Thanks to Michael Zedeler for submitting the patch.
## 0.9.18 (release date: 2015-12-08) ## 0.9.18 (release date: 2015-12-08)

1
image/Dockerfile
View File

@@ -6,6 +6,7 @@ ADD . /bd_build
RUN /bd_build/prepare.sh && \ RUN /bd_build/prepare.sh && \
/bd_build/system_services.sh && \ /bd_build/system_services.sh && \
/bd_build/utilities.sh && \ /bd_build/utilities.sh && \
/bd_build/fix_pam_bug.sh && \
/bd_build/cleanup.sh /bd_build/cleanup.sh
CMD ["/sbin/my_init"] CMD ["/sbin/my_init"]

33
image/fix_pam_bug.sh Executable file
View File

@@ -0,0 +1,33 @@
#!/bin/bash
set -e
source /bd_build/buildconfig
set -x
# Fixes https://github.com/docker/docker/issues/6345
# The Github is closed, but some apps such as pbuilder still triggers it.
export CONFIGURE_OPTS=--disable-audit
cd /tmp
$minimal_apt_get_install gdebi-core
apt-get build-dep -y --no-install-recommends pam
apt-get source -y -b pam
gdebi -n libpam-doc*.deb libpam-modules*.deb libpam-runtime*.deb libpam0g*.deb
rm -rf *.deb *.gz *.dsc *.changes pam-*
# Unfortunately there is no way to automatically remove build deps, so we do this manually.
apt-get remove -y gdebi-core autoconf automake autopoint autotools-dev binutils bsdmainutils \
build-essential bzip2 cpp cpp-5 debhelper dh-autoreconf dh-strip-nondeterminism \
diffstat docbook-xml docbook-xsl dpkg-dev flex g++ g++-5 gcc gcc-5 gettext gettext-base \
groff-base intltool-debian libarchive-zip-perl libasan2 libasprintf0v5 libatomic1 \
libaudit-dev libc-dev-bin libc6-dev libcc1-0 libcilkrts5 libcrack2 libcrack2-dev libcroco3 \
libdb-dev libdb5.3-dev libdpkg-perl libfile-stripnondeterminism-perl libfl-dev libgc1c2 \
libgcc-5-dev libgdbm3 libgomp1 libgpm2 libicu55 libisl15 libitm1 liblsan0 libmpc3 \
libmpfr4 libmpx0 libpcre16-3 libpcre3-dev libpcre32-3 libpcrecpp0v5 libperl5.22 \
libpipeline1 libquadmath0 libselinux1-dev libsepol1-dev libsigsegv2 libstdc++-5-dev \
libtimedate-perl libtool libtsan0 libubsan0 libunistring0 libxml2 libxml2-utils \
libxslt1.1 linux-libc-dev m4 make man-db patch perl perl-modules-5.22 pkg-config \
po-debconf quilt sgml-base sgml-data w3m xml-core xsltproc xz-utils
apt-get remove -y gdebi-core
apt-get autoremove -y