Skip to content

Commit

Permalink
Merge pull request docker-library#205 from infosiftr/arch-fixes
Browse files Browse the repository at this point in the history 
Fix _ctypes test failure on Alpine and build failure on Debian on ppc64le
  • Loading branch information
@tianon
tianon authored Jun 16, 2017
2 parents a5bb6d1 + 8282e3f commit 296f026
Show file tree
Hide file tree
Showing 18 changed files with 68 additions and 0 deletions.
2 changes: 2 additions & 0 deletions 3.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
4 changes: 4 additions & 0 deletions 3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ RUN set -ex \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
expat-dev \
gcc \
gdbm-dev \
libc-dev \
libffi-dev \
linux-headers \
make \
ncurses-dev \
Expand All @@ -66,6 +68,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
6 changes: 6 additions & 0 deletions 3.3/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ ENV LANG C.UTF-8
# runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
libexpat1 \
libffi6 \
libgdbm3 \
libsqlite3-0 \
libssl1.0.0 \
Expand All @@ -30,6 +32,8 @@ RUN set -ex \
gcc \
libbz2-dev \
libc6-dev \
libexpat1-dev \
libffi-dev \
libgdbm-dev \
liblzma-dev \
libncurses-dev \
Expand Down Expand Up @@ -61,6 +65,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
2 changes: 2 additions & 0 deletions 3.3/wheezy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
2 changes: 2 additions & 0 deletions 3.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
4 changes: 4 additions & 0 deletions 3.4/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ RUN set -ex \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
expat-dev \
gcc \
gdbm-dev \
libc-dev \
libffi-dev \
linux-headers \
make \
ncurses-dev \
Expand All @@ -66,6 +68,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
6 changes: 6 additions & 0 deletions 3.4/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ ENV LANG C.UTF-8
# runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
libexpat1 \
libffi6 \
libgdbm3 \
libsqlite3-0 \
libssl1.0.0 \
Expand All @@ -30,6 +32,8 @@ RUN set -ex \
gcc \
libbz2-dev \
libc6-dev \
libexpat1-dev \
libffi-dev \
libgdbm-dev \
liblzma-dev \
libncurses-dev \
Expand Down Expand Up @@ -61,6 +65,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
2 changes: 2 additions & 0 deletions 3.4/wheezy/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
2 changes: 2 additions & 0 deletions 3.5/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
4 changes: 4 additions & 0 deletions 3.5/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ RUN set -ex \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
expat-dev \
gcc \
gdbm-dev \
libc-dev \
libffi-dev \
linux-headers \
make \
ncurses-dev \
Expand All @@ -66,6 +68,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
6 changes: 6 additions & 0 deletions 3.5/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ ENV LANG C.UTF-8
# runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
libexpat1 \
libffi6 \
libgdbm3 \
libsqlite3-0 \
libssl1.0.0 \
Expand All @@ -30,6 +32,8 @@ RUN set -ex \
gcc \
libbz2-dev \
libc6-dev \
libexpat1-dev \
libffi-dev \
libgdbm-dev \
liblzma-dev \
libncurses-dev \
Expand Down Expand Up @@ -61,6 +65,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
2 changes: 2 additions & 0 deletions 3.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
4 changes: 4 additions & 0 deletions 3.6/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ RUN set -ex \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
expat-dev \
gcc \
gdbm-dev \
libc-dev \
libffi-dev \
linux-headers \
make \
ncurses-dev \
Expand All @@ -66,6 +68,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
4 changes: 4 additions & 0 deletions 3.6/alpine3.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ RUN set -ex \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
expat-dev \
gcc \
gdbm-dev \
libc-dev \
libffi-dev \
linux-headers \
make \
ncurses-dev \
Expand All @@ -66,6 +68,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
6 changes: 6 additions & 0 deletions 3.6/slim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ ENV LANG C.UTF-8
# runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
libexpat1 \
libffi6 \
libgdbm3 \
libsqlite3-0 \
libssl1.0.0 \
Expand All @@ -30,6 +32,8 @@ RUN set -ex \
gcc \
libbz2-dev \
libc6-dev \
libexpat1-dev \
libffi-dev \
libgdbm-dev \
liblzma-dev \
libncurses-dev \
Expand Down Expand Up @@ -61,6 +65,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ RUN set -ex \
bzip2-dev \
coreutils \
dpkg-dev dpkg \
expat-dev \
gcc \
gdbm-dev \
libc-dev \
libffi-dev \
linux-headers \
make \
ncurses-dev \
Expand All @@ -60,6 +62,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile-slim.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ ENV LANG C.UTF-8
# runtime dependencies
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
libexpat1 \
libffi6 \
libgdbm3 \
libsqlite3-0 \
libssl1.0.0 \
Expand All @@ -24,6 +26,8 @@ RUN set -ex \
gcc \
libbz2-dev \
libc6-dev \
libexpat1-dev \
libffi-dev \
libgdbm-dev \
liblzma-dev \
libncurses-dev \
Expand Down Expand Up @@ -55,6 +59,8 @@ RUN set -ex \
--build="$gnuArch" \
--enable-loadable-sqlite-extensions \
--enable-shared \
--with-system-expat \
--with-system-ffi \
--without-ensurepip \
&& make -j "$(nproc)" \
&& make install \
Expand Down

0 comments on commit 296f026

Please sign in to comment.