Merge pull request #373 from phusion/next

Update README.md regarding ignored env vars.
Merge pull request #370 from phusion/next
2026-03-26 20:38:58 +00:00 · 2017-03-20 21:00:45 -07:00 · 2017-03-20 20:50:22 -07:00 · 2017-03-20 12:49:11 -07:00 · 2017-03-06 14:52:15 +00:00 · 2017-03-06 14:51:22 +00:00
2 changed files with 6 additions and 6 deletions
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM armhf/ubuntu
 MAINTAINER Phusion <info@phusion.nl>
 COPY . /bd_build
--- a/image/fix_pam_bug.sh
+++ b/image/fix_pam_bug.sh
@@ -20,12 +20,12 @@ apt-get remove -y gdebi-core autoconf automake autopoint autotools-dev binutils
 	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 \
+	libaudit-dev libc-dev-bin libc6-dev libcc1-0 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 \
+	libgcc-5-dev libgdbm3 libgomp1 libgpm2 libicu55 libisl15 libmpc3 \
-	libmpfr4 libmpx0 libpcre16-3 libpcre3-dev libpcre32-3 libpcrecpp0v5 libperl5.22 \
+	libmpfr4 libpcre16-3 libpcre3-dev libpcre32-3 libpcrecpp0v5 libperl5.22 \
-	libpipeline1 libquadmath0 libselinux1-dev libsepol1-dev libsigsegv2 libstdc++-5-dev \
+	libpipeline1 libselinux1-dev libsepol1-dev libsigsegv2 libstdc++-5-dev \
-	libtimedate-perl libtool libtsan0 libubsan0 libunistring0 libxml2 libxml2-utils \
+	libtimedate-perl libtool 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
Author	SHA1	Message	Date
Travis Rowland	f374c49424	Merge pull request #373 from phusion/next Update README.md regarding ignored env vars.	2017-03-20 21:00:45 -07:00
Travis Rowland	c375506f23	Merge pull request #370 from phusion/next Updating README.md Fixes #228	2017-03-20 20:50:22 -07:00
Travis Rowland	19170b8d38	Merge pull request #368 from kobotoolbox/armhf `armhf` support.	2017-03-20 12:49:11 -07:00
Esmail Fadae	5a920d2291	No need to uninstall packages not available on `armhf`.	2017-03-06 14:52:15 +00:00
Esmail Fadae	bc06300b3e	Use an `armhf` base image.	2017-03-06 14:51:22 +00:00