From c71ea7995d68c3219f2d251768a384d9995d4af0 Mon Sep 17 00:00:00 2001 From: Jamie Hewland Date: Mon, 30 Apr 2018 12:57:54 +0200 Subject: [PATCH 1/2] Alpine: Sort dependencies --- 2.7/alpine3.6/Dockerfile | 4 ++-- 2.7/alpine3.7/Dockerfile | 4 ++-- 3.4/alpine3.7/Dockerfile | 4 ++-- 3.5/alpine3.7/Dockerfile | 4 ++-- 3.6/alpine3.6/Dockerfile | 4 ++-- 3.6/alpine3.7/Dockerfile | 4 ++-- 3.7-rc/alpine3.7/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/2.7/alpine3.6/Dockerfile b/2.7/alpine3.6/Dockerfile index 71f7f09c9..2d86a83d7 100644 --- 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 index 333f12f3e..69e133693 100644 --- a/2.7/alpine3.7/Dockerfile +++ b/2.7/alpine3.7/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/3.4/alpine3.7/Dockerfile b/3.4/alpine3.7/Dockerfile index 9a42e59da..eb9f5b112 100644 --- 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 index d442a77e9..d3e95d4c5 100644 --- 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 index d08e1a967..403eea39e 100644 --- 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 index 41bb1bc14..d7baca220 100644 --- 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 index 80d664d0a..9cb3fc64b 100644 --- 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 index f2b12c510..2f7bb8691 100644 --- 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 \ From 8d755d18e6990b8ad6f137d7613ba7937389b47a Mon Sep 17 00:00:00 2001 From: Jamie Hewland Date: Mon, 30 Apr 2018 12:59:07 +0200 Subject: [PATCH 2/2] 2.7/alpine3.7: Add libraries for nis module --- 2.7/alpine3.7/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/2.7/alpine3.7/Dockerfile b/2.7/alpine3.7/Dockerfile index 69e133693..a8aedd2a6 100644 --- a/2.7/alpine3.7/Dockerfile +++ b/2.7/alpine3.7/Dockerfile @@ -40,8 +40,10 @@ RUN set -ex \ gcc \ gdbm-dev \ libc-dev \ + libnsl-dev \ libressl \ libressl-dev \ + libtirpc-dev \ linux-headers \ make \ ncurses-dev \