From a8ef31af92d82e6c1de375e4e8c94ad5f634694e Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Wed, 23 Oct 2019 22:09:30 +0200 Subject: [PATCH] Fix missing setcap/pgrep commands (#254) Fixes #246 Fixes #252 Signed-off-by: Wouter Born --- 1.8.3/alpine/Dockerfile-amd64 | 2 +- 1.8.3/alpine/Dockerfile-arm64 | 2 +- 1.8.3/alpine/Dockerfile-armhf | 2 +- 1.8.3/debian/Dockerfile-amd64 | 3 ++- 1.8.3/debian/Dockerfile-arm64 | 3 ++- 1.8.3/debian/Dockerfile-armhf | 3 ++- 2.0.0/alpine/Dockerfile-amd64 | 2 +- 2.0.0/alpine/Dockerfile-arm64 | 2 +- 2.0.0/alpine/Dockerfile-armhf | 2 +- 2.0.0/debian/Dockerfile-amd64 | 3 ++- 2.0.0/debian/Dockerfile-arm64 | 3 ++- 2.0.0/debian/Dockerfile-armhf | 3 ++- 2.1.0/alpine/Dockerfile-amd64 | 2 +- 2.1.0/alpine/Dockerfile-arm64 | 2 +- 2.1.0/alpine/Dockerfile-armhf | 2 +- 2.1.0/debian/Dockerfile-amd64 | 3 ++- 2.1.0/debian/Dockerfile-arm64 | 3 ++- 2.1.0/debian/Dockerfile-armhf | 3 ++- 2.2.0/alpine/Dockerfile-amd64 | 2 +- 2.2.0/alpine/Dockerfile-arm64 | 2 +- 2.2.0/alpine/Dockerfile-armhf | 2 +- 2.2.0/debian/Dockerfile-amd64 | 3 ++- 2.2.0/debian/Dockerfile-arm64 | 3 ++- 2.2.0/debian/Dockerfile-armhf | 3 ++- 2.3.0/alpine/Dockerfile-amd64 | 2 +- 2.3.0/alpine/Dockerfile-arm64 | 2 +- 2.3.0/alpine/Dockerfile-armhf | 2 +- 2.3.0/debian/Dockerfile-amd64 | 3 ++- 2.3.0/debian/Dockerfile-arm64 | 3 ++- 2.3.0/debian/Dockerfile-armhf | 3 ++- 2.4.0/alpine/Dockerfile-amd64 | 2 +- 2.4.0/alpine/Dockerfile-arm64 | 2 +- 2.4.0/alpine/Dockerfile-armhf | 2 +- 2.4.0/debian/Dockerfile-amd64 | 3 ++- 2.4.0/debian/Dockerfile-arm64 | 3 ++- 2.4.0/debian/Dockerfile-armhf | 3 ++- 2.5.0-snapshot/alpine/Dockerfile-amd64 | 2 +- 2.5.0-snapshot/alpine/Dockerfile-arm64 | 2 +- 2.5.0-snapshot/alpine/Dockerfile-armhf | 2 +- 2.5.0-snapshot/debian/Dockerfile-amd64 | 3 ++- 2.5.0-snapshot/debian/Dockerfile-arm64 | 3 ++- 2.5.0-snapshot/debian/Dockerfile-armhf | 3 ++- 2.5.0.M2/alpine/Dockerfile-amd64 | 2 +- 2.5.0.M2/alpine/Dockerfile-arm64 | 2 +- 2.5.0.M2/alpine/Dockerfile-armhf | 2 +- 2.5.0.M2/debian/Dockerfile-amd64 | 3 ++- 2.5.0.M2/debian/Dockerfile-arm64 | 3 ++- 2.5.0.M2/debian/Dockerfile-armhf | 3 ++- 2.5.0.M3/alpine/Dockerfile-amd64 | 2 +- 2.5.0.M3/alpine/Dockerfile-arm64 | 2 +- 2.5.0.M3/alpine/Dockerfile-armhf | 2 +- 2.5.0.M3/debian/Dockerfile-amd64 | 3 ++- 2.5.0.M3/debian/Dockerfile-arm64 | 3 ++- 2.5.0.M3/debian/Dockerfile-armhf | 3 ++- 2.5.0.M4/alpine/Dockerfile-amd64 | 2 +- 2.5.0.M4/alpine/Dockerfile-arm64 | 2 +- 2.5.0.M4/alpine/Dockerfile-armhf | 2 +- 2.5.0.M4/debian/Dockerfile-amd64 | 3 ++- 2.5.0.M4/debian/Dockerfile-arm64 | 3 ++- 2.5.0.M4/debian/Dockerfile-armhf | 3 ++- update-docker-files.sh | 5 +++-- 61 files changed, 93 insertions(+), 62 deletions(-) diff --git a/1.8.3/alpine/Dockerfile-amd64 b/1.8.3/alpine/Dockerfile-amd64 index 9b81dba..e5aad41 100644 --- a/1.8.3/alpine/Dockerfile-amd64 +++ b/1.8.3/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/1.8.3/alpine/Dockerfile-arm64 b/1.8.3/alpine/Dockerfile-arm64 index d5b9989..e75855c 100644 --- a/1.8.3/alpine/Dockerfile-arm64 +++ b/1.8.3/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/1.8.3/alpine/Dockerfile-armhf b/1.8.3/alpine/Dockerfile-armhf index e1c63ef..455b692 100644 --- a/1.8.3/alpine/Dockerfile-armhf +++ b/1.8.3/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/1.8.3/debian/Dockerfile-amd64 b/1.8.3/debian/Dockerfile-amd64 index 98d4f6f..d7019a7 100644 --- a/1.8.3/debian/Dockerfile-amd64 +++ b/1.8.3/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/1.8.3/debian/Dockerfile-arm64 b/1.8.3/debian/Dockerfile-arm64 index 37f4bc7..bb78067 100644 --- a/1.8.3/debian/Dockerfile-arm64 +++ b/1.8.3/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/1.8.3/debian/Dockerfile-armhf b/1.8.3/debian/Dockerfile-armhf index ae32eaf..0cbc8fb 100644 --- a/1.8.3/debian/Dockerfile-armhf +++ b/1.8.3/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.0.0/alpine/Dockerfile-amd64 b/2.0.0/alpine/Dockerfile-amd64 index 68916cb..a5acba4 100644 --- a/2.0.0/alpine/Dockerfile-amd64 +++ b/2.0.0/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.0.0/alpine/Dockerfile-arm64 b/2.0.0/alpine/Dockerfile-arm64 index 3409b37..3b7276c 100644 --- a/2.0.0/alpine/Dockerfile-arm64 +++ b/2.0.0/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.0.0/alpine/Dockerfile-armhf b/2.0.0/alpine/Dockerfile-armhf index d613a05..091e0eb 100644 --- a/2.0.0/alpine/Dockerfile-armhf +++ b/2.0.0/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.0.0/debian/Dockerfile-amd64 b/2.0.0/debian/Dockerfile-amd64 index 63d055f..c347dff 100644 --- a/2.0.0/debian/Dockerfile-amd64 +++ b/2.0.0/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.0.0/debian/Dockerfile-arm64 b/2.0.0/debian/Dockerfile-arm64 index ad2c5a4..c140f72 100644 --- a/2.0.0/debian/Dockerfile-arm64 +++ b/2.0.0/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.0.0/debian/Dockerfile-armhf b/2.0.0/debian/Dockerfile-armhf index 47cdc99..4dfa8c7 100644 --- a/2.0.0/debian/Dockerfile-armhf +++ b/2.0.0/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.1.0/alpine/Dockerfile-amd64 b/2.1.0/alpine/Dockerfile-amd64 index 87f462e..ed4c011 100644 --- a/2.1.0/alpine/Dockerfile-amd64 +++ b/2.1.0/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.1.0/alpine/Dockerfile-arm64 b/2.1.0/alpine/Dockerfile-arm64 index 059ddf6..1510371 100644 --- a/2.1.0/alpine/Dockerfile-arm64 +++ b/2.1.0/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.1.0/alpine/Dockerfile-armhf b/2.1.0/alpine/Dockerfile-armhf index 97d4ffd..fe58289 100644 --- a/2.1.0/alpine/Dockerfile-armhf +++ b/2.1.0/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.1.0/debian/Dockerfile-amd64 b/2.1.0/debian/Dockerfile-amd64 index 47f6909..542888a 100644 --- a/2.1.0/debian/Dockerfile-amd64 +++ b/2.1.0/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.1.0/debian/Dockerfile-arm64 b/2.1.0/debian/Dockerfile-arm64 index dc7054e..f6ce3ec 100644 --- a/2.1.0/debian/Dockerfile-arm64 +++ b/2.1.0/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.1.0/debian/Dockerfile-armhf b/2.1.0/debian/Dockerfile-armhf index 5cecf2e..c81f387 100644 --- a/2.1.0/debian/Dockerfile-armhf +++ b/2.1.0/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.2.0/alpine/Dockerfile-amd64 b/2.2.0/alpine/Dockerfile-amd64 index 0ff035e..84b9ea1 100644 --- a/2.2.0/alpine/Dockerfile-amd64 +++ b/2.2.0/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.2.0/alpine/Dockerfile-arm64 b/2.2.0/alpine/Dockerfile-arm64 index 5ac1f48..a490803 100644 --- a/2.2.0/alpine/Dockerfile-arm64 +++ b/2.2.0/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.2.0/alpine/Dockerfile-armhf b/2.2.0/alpine/Dockerfile-armhf index a959286..5127974 100644 --- a/2.2.0/alpine/Dockerfile-armhf +++ b/2.2.0/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.2.0/debian/Dockerfile-amd64 b/2.2.0/debian/Dockerfile-amd64 index a5750b8..481b534 100644 --- a/2.2.0/debian/Dockerfile-amd64 +++ b/2.2.0/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.2.0/debian/Dockerfile-arm64 b/2.2.0/debian/Dockerfile-arm64 index 536b295..743b6b2 100644 --- a/2.2.0/debian/Dockerfile-arm64 +++ b/2.2.0/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.2.0/debian/Dockerfile-armhf b/2.2.0/debian/Dockerfile-armhf index 423229a..c49e821 100644 --- a/2.2.0/debian/Dockerfile-armhf +++ b/2.2.0/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.3.0/alpine/Dockerfile-amd64 b/2.3.0/alpine/Dockerfile-amd64 index 228bcea..56f46f2 100644 --- a/2.3.0/alpine/Dockerfile-amd64 +++ b/2.3.0/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.3.0/alpine/Dockerfile-arm64 b/2.3.0/alpine/Dockerfile-arm64 index 026b47c..f37d81a 100644 --- a/2.3.0/alpine/Dockerfile-arm64 +++ b/2.3.0/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.3.0/alpine/Dockerfile-armhf b/2.3.0/alpine/Dockerfile-armhf index 2fa7b12..9a20017 100644 --- a/2.3.0/alpine/Dockerfile-armhf +++ b/2.3.0/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.3.0/debian/Dockerfile-amd64 b/2.3.0/debian/Dockerfile-amd64 index 4022f6d..8367212 100644 --- a/2.3.0/debian/Dockerfile-amd64 +++ b/2.3.0/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.3.0/debian/Dockerfile-arm64 b/2.3.0/debian/Dockerfile-arm64 index f46bb1b..5923fce 100644 --- a/2.3.0/debian/Dockerfile-arm64 +++ b/2.3.0/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.3.0/debian/Dockerfile-armhf b/2.3.0/debian/Dockerfile-armhf index c43ae4e..a15dcb5 100644 --- a/2.3.0/debian/Dockerfile-armhf +++ b/2.3.0/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.4.0/alpine/Dockerfile-amd64 b/2.4.0/alpine/Dockerfile-amd64 index 864afdd..0b265ef 100644 --- a/2.4.0/alpine/Dockerfile-amd64 +++ b/2.4.0/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.4.0/alpine/Dockerfile-arm64 b/2.4.0/alpine/Dockerfile-arm64 index 5315b71..2817c5e 100644 --- a/2.4.0/alpine/Dockerfile-arm64 +++ b/2.4.0/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.4.0/alpine/Dockerfile-armhf b/2.4.0/alpine/Dockerfile-armhf index 93935ed..403d2a8 100644 --- a/2.4.0/alpine/Dockerfile-armhf +++ b/2.4.0/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.4.0/debian/Dockerfile-amd64 b/2.4.0/debian/Dockerfile-amd64 index d0b0d2e..f014831 100644 --- a/2.4.0/debian/Dockerfile-amd64 +++ b/2.4.0/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.4.0/debian/Dockerfile-arm64 b/2.4.0/debian/Dockerfile-arm64 index 5ffb94b..56683dc 100644 --- a/2.4.0/debian/Dockerfile-arm64 +++ b/2.4.0/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.4.0/debian/Dockerfile-armhf b/2.4.0/debian/Dockerfile-armhf index 6a73983..5f33868 100644 --- a/2.4.0/debian/Dockerfile-armhf +++ b/2.4.0/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0-snapshot/alpine/Dockerfile-amd64 b/2.5.0-snapshot/alpine/Dockerfile-amd64 index 4a20a7b..d458f4a 100644 --- a/2.5.0-snapshot/alpine/Dockerfile-amd64 +++ b/2.5.0-snapshot/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0-snapshot/alpine/Dockerfile-arm64 b/2.5.0-snapshot/alpine/Dockerfile-arm64 index 93f6d90..b918c6b 100644 --- a/2.5.0-snapshot/alpine/Dockerfile-arm64 +++ b/2.5.0-snapshot/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0-snapshot/alpine/Dockerfile-armhf b/2.5.0-snapshot/alpine/Dockerfile-armhf index 1480f5c..0d84edb 100644 --- a/2.5.0-snapshot/alpine/Dockerfile-armhf +++ b/2.5.0-snapshot/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0-snapshot/debian/Dockerfile-amd64 b/2.5.0-snapshot/debian/Dockerfile-amd64 index 05ce31c..0741bf3 100644 --- a/2.5.0-snapshot/debian/Dockerfile-amd64 +++ b/2.5.0-snapshot/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0-snapshot/debian/Dockerfile-arm64 b/2.5.0-snapshot/debian/Dockerfile-arm64 index e806342..e734058 100644 --- a/2.5.0-snapshot/debian/Dockerfile-arm64 +++ b/2.5.0-snapshot/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0-snapshot/debian/Dockerfile-armhf b/2.5.0-snapshot/debian/Dockerfile-armhf index ff943c1..e261089 100644 --- a/2.5.0-snapshot/debian/Dockerfile-armhf +++ b/2.5.0-snapshot/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M2/alpine/Dockerfile-amd64 b/2.5.0.M2/alpine/Dockerfile-amd64 index 816460b..d28ee2b 100644 --- a/2.5.0.M2/alpine/Dockerfile-amd64 +++ b/2.5.0.M2/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M2/alpine/Dockerfile-arm64 b/2.5.0.M2/alpine/Dockerfile-arm64 index 080f2de..af724cf 100644 --- a/2.5.0.M2/alpine/Dockerfile-arm64 +++ b/2.5.0.M2/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M2/alpine/Dockerfile-armhf b/2.5.0.M2/alpine/Dockerfile-armhf index 88fa48c..fb6e7b0 100644 --- a/2.5.0.M2/alpine/Dockerfile-armhf +++ b/2.5.0.M2/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M2/debian/Dockerfile-amd64 b/2.5.0.M2/debian/Dockerfile-amd64 index 4119174..35e7dd2 100644 --- a/2.5.0.M2/debian/Dockerfile-amd64 +++ b/2.5.0.M2/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M2/debian/Dockerfile-arm64 b/2.5.0.M2/debian/Dockerfile-arm64 index a478569..484c5b4 100644 --- a/2.5.0.M2/debian/Dockerfile-arm64 +++ b/2.5.0.M2/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M2/debian/Dockerfile-armhf b/2.5.0.M2/debian/Dockerfile-armhf index 708f0ed..41c5d15 100644 --- a/2.5.0.M2/debian/Dockerfile-armhf +++ b/2.5.0.M2/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M3/alpine/Dockerfile-amd64 b/2.5.0.M3/alpine/Dockerfile-amd64 index a691b35..9039a95 100644 --- a/2.5.0.M3/alpine/Dockerfile-amd64 +++ b/2.5.0.M3/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M3/alpine/Dockerfile-arm64 b/2.5.0.M3/alpine/Dockerfile-arm64 index 60eb944..3fe3ccc 100644 --- a/2.5.0.M3/alpine/Dockerfile-arm64 +++ b/2.5.0.M3/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M3/alpine/Dockerfile-armhf b/2.5.0.M3/alpine/Dockerfile-armhf index 0500e6c..14fbc53 100644 --- a/2.5.0.M3/alpine/Dockerfile-armhf +++ b/2.5.0.M3/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M3/debian/Dockerfile-amd64 b/2.5.0.M3/debian/Dockerfile-amd64 index b4ada6c..659c9fd 100644 --- a/2.5.0.M3/debian/Dockerfile-amd64 +++ b/2.5.0.M3/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M3/debian/Dockerfile-arm64 b/2.5.0.M3/debian/Dockerfile-arm64 index 1f8ae1d..5e45912 100644 --- a/2.5.0.M3/debian/Dockerfile-arm64 +++ b/2.5.0.M3/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M3/debian/Dockerfile-armhf b/2.5.0.M3/debian/Dockerfile-armhf index 15a097b..83fc0b8 100644 --- a/2.5.0.M3/debian/Dockerfile-armhf +++ b/2.5.0.M3/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M4/alpine/Dockerfile-amd64 b/2.5.0.M4/alpine/Dockerfile-amd64 index 7c579f9..35ff3b7 100644 --- a/2.5.0.M4/alpine/Dockerfile-amd64 +++ b/2.5.0.M4/alpine/Dockerfile-amd64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M4/alpine/Dockerfile-arm64 b/2.5.0.M4/alpine/Dockerfile-arm64 index e1ba29f..de65fd8 100644 --- a/2.5.0.M4/alpine/Dockerfile-arm64 +++ b/2.5.0.M4/alpine/Dockerfile-arm64 @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M4/alpine/Dockerfile-armhf b/2.5.0.M4/alpine/Dockerfile-armhf index 36c020e..b00fca3 100644 --- a/2.5.0.M4/alpine/Dockerfile-armhf +++ b/2.5.0.M4/alpine/Dockerfile-armhf @@ -59,7 +59,7 @@ RUN apk upgrade --no-cache && \ ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ diff --git a/2.5.0.M4/debian/Dockerfile-amd64 b/2.5.0.M4/debian/Dockerfile-amd64 index 408e138..6ee7406 100644 --- a/2.5.0.M4/debian/Dockerfile-amd64 +++ b/2.5.0.M4/debian/Dockerfile-amd64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M4/debian/Dockerfile-arm64 b/2.5.0.M4/debian/Dockerfile-arm64 index 087efe5..dec2f50 100644 --- a/2.5.0.M4/debian/Dockerfile-arm64 +++ b/2.5.0.M4/debian/Dockerfile-arm64 @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/2.5.0.M4/debian/Dockerfile-armhf b/2.5.0.M4/debian/Dockerfile-armhf index f628a12..a1b2c14 100644 --- a/2.5.0.M4/debian/Dockerfile-armhf +++ b/2.5.0.M4/debian/Dockerfile-armhf @@ -59,10 +59,11 @@ RUN apt-get update && \ curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \ diff --git a/update-docker-files.sh b/update-docker-files.sh index ecd3b99..b8510c3 100755 --- a/update-docker-files.sh +++ b/update-docker-files.sh @@ -139,7 +139,7 @@ print_basepackages_alpine() { ca-certificates \ curl \ fontconfig \ - libpcap-dev \ + libcap \ nss \ shadow \ su-exec \ @@ -166,10 +166,11 @@ print_basepackages_debian() { curl \ fontconfig \ gosu \ - libpcap-dev \ + libcap2-bin \ locales \ locales-all \ netbase \ + procps \ tini \ unzip \ wget \