Merge pull request docker-library#281 from JayH5/py2.7-alpine3.7-nis

tianon · web-flow · commit bbbc37fff341 · 2018-06-04T17:06:08.000-07:00
2.7/alpine3.7: Add nis libraries now that 2.7.15 is patched
diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile
@@ -40,11 +40,11 @@ RUN set -ex \
 		gcc \
 		gdbm-dev \
 		libc-dev \
+		libressl \
+		libressl-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		libressl \
-		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile
@@ -40,11 +40,13 @@ RUN set -ex \
 		gcc \
 		gdbm-dev \
 		libc-dev \
+		libnsl-dev \
+		libressl \
+		libressl-dev \
+		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		libressl \
-		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
diff --git a/3.4/alpine3.7/Dockerfile b/3.4/alpine3.7/Dockerfile
@@ -47,12 +47,12 @@ RUN set -ex \
 		libc-dev \
 		libffi-dev \
 		libnsl-dev \
+		libressl \
+		libressl-dev \
 		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		libressl \
-		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
diff --git a/3.5/alpine3.7/Dockerfile b/3.5/alpine3.7/Dockerfile
@@ -47,12 +47,12 @@ RUN set -ex \
 		libc-dev \
 		libffi-dev \
 		libnsl-dev \
+		libressl \
+		libressl-dev \
 		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		libressl \
-		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
diff --git a/3.6/alpine3.6/Dockerfile b/3.6/alpine3.6/Dockerfile
@@ -46,11 +46,11 @@ RUN set -ex \
 		gdbm-dev \
 		libc-dev \
 		libffi-dev \
+		libressl \
+		libressl-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		libressl \
-		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
diff --git a/3.6/alpine3.7/Dockerfile b/3.6/alpine3.7/Dockerfile
@@ -47,12 +47,12 @@ RUN set -ex \
 		libc-dev \
 		libffi-dev \
 		libnsl-dev \
+		libressl \
+		libressl-dev \
 		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		libressl \
-		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
diff --git a/3.7-rc/alpine3.7/Dockerfile b/3.7-rc/alpine3.7/Dockerfile
@@ -47,12 +47,12 @@ RUN set -ex \
 		libc-dev \
 		libffi-dev \
 		libnsl-dev \
+		openssl \
+		openssl-dev \
 		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		openssl \
-		openssl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -41,12 +41,12 @@ RUN set -ex \
 		libc-dev \
 		libffi-dev \
 		libnsl-dev \
+		libressl \
+		libressl-dev \
 		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		libressl \
-		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
