From 14434159e4cff37ba4b34a9b94a46dd80db875d1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 16 Sep 2019 14:32:47 -0500 Subject: [PATCH 1/2] Remove tzdata from Alpine runtime-deps --- 2.1/runtime-deps/alpine3.10/amd64/Dockerfile | 1 - 2.1/runtime-deps/alpine3.9/amd64/Dockerfile | 1 - 3.0/runtime-deps/alpine3.10/amd64/Dockerfile | 1 - 3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile | 1 - 3.0/runtime-deps/alpine3.9/amd64/Dockerfile | 1 - 3.0/runtime-deps/alpine3.9/arm64v8/Dockerfile | 1 - 6 files changed, 6 deletions(-) diff --git a/2.1/runtime-deps/alpine3.10/amd64/Dockerfile b/2.1/runtime-deps/alpine3.10/amd64/Dockerfile index 5bb46d302d..a5c9c42718 100644 --- a/2.1/runtime-deps/alpine3.10/amd64/Dockerfile +++ b/2.1/runtime-deps/alpine3.10/amd64/Dockerfile @@ -10,7 +10,6 @@ RUN apk add --no-cache \ libssl1.1 \ libstdc++ \ lttng-ust \ - tzdata \ userspace-rcu \ zlib diff --git a/2.1/runtime-deps/alpine3.9/amd64/Dockerfile b/2.1/runtime-deps/alpine3.9/amd64/Dockerfile index 9c3d971017..8f9fe3ea1f 100644 --- a/2.1/runtime-deps/alpine3.9/amd64/Dockerfile +++ b/2.1/runtime-deps/alpine3.9/amd64/Dockerfile @@ -10,7 +10,6 @@ RUN apk add --no-cache \ libssl1.1 \ libstdc++ \ lttng-ust \ - tzdata \ userspace-rcu \ zlib diff --git a/3.0/runtime-deps/alpine3.10/amd64/Dockerfile b/3.0/runtime-deps/alpine3.10/amd64/Dockerfile index 6c9e2cd92f..3938225f75 100644 --- a/3.0/runtime-deps/alpine3.10/amd64/Dockerfile +++ b/3.0/runtime-deps/alpine3.10/amd64/Dockerfile @@ -9,7 +9,6 @@ RUN apk add --no-cache \ libintl \ libssl1.1 \ libstdc++ \ - tzdata \ zlib # Configure web servers to bind to port 80 when present diff --git a/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile b/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile index a60275e3fd..b0d325fe5e 100644 --- a/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile +++ b/3.0/runtime-deps/alpine3.10/arm64v8/Dockerfile @@ -9,7 +9,6 @@ RUN apk add --no-cache \ libintl \ libssl1.1 \ libstdc++ \ - tzdata \ zlib # Configure web servers to bind to port 80 when present diff --git a/3.0/runtime-deps/alpine3.9/amd64/Dockerfile b/3.0/runtime-deps/alpine3.9/amd64/Dockerfile index 6401804aeb..e3c2c53e47 100644 --- a/3.0/runtime-deps/alpine3.9/amd64/Dockerfile +++ b/3.0/runtime-deps/alpine3.9/amd64/Dockerfile @@ -9,7 +9,6 @@ RUN apk add --no-cache \ libintl \ libssl1.1 \ libstdc++ \ - tzdata \ zlib # Configure web servers to bind to port 80 when present diff --git a/3.0/runtime-deps/alpine3.9/arm64v8/Dockerfile b/3.0/runtime-deps/alpine3.9/arm64v8/Dockerfile index 6e0565cc32..e7665bedb8 100644 --- a/3.0/runtime-deps/alpine3.9/arm64v8/Dockerfile +++ b/3.0/runtime-deps/alpine3.9/arm64v8/Dockerfile @@ -9,7 +9,6 @@ RUN apk add --no-cache \ libintl \ libssl1.1 \ libstdc++ \ - tzdata \ zlib # Configure web servers to bind to port 80 when present From 90a48489885ce5fd57ec34bb2b6051f6c9c0b60b Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 16 Sep 2019 15:42:03 -0500 Subject: [PATCH 2/2] Revert change to 2.1 --- 2.1/runtime-deps/alpine3.10/amd64/Dockerfile | 1 + 2.1/runtime-deps/alpine3.9/amd64/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/2.1/runtime-deps/alpine3.10/amd64/Dockerfile b/2.1/runtime-deps/alpine3.10/amd64/Dockerfile index a5c9c42718..5bb46d302d 100644 --- a/2.1/runtime-deps/alpine3.10/amd64/Dockerfile +++ b/2.1/runtime-deps/alpine3.10/amd64/Dockerfile @@ -10,6 +10,7 @@ RUN apk add --no-cache \ libssl1.1 \ libstdc++ \ lttng-ust \ + tzdata \ userspace-rcu \ zlib diff --git a/2.1/runtime-deps/alpine3.9/amd64/Dockerfile b/2.1/runtime-deps/alpine3.9/amd64/Dockerfile index 8f9fe3ea1f..9c3d971017 100644 --- a/2.1/runtime-deps/alpine3.9/amd64/Dockerfile +++ b/2.1/runtime-deps/alpine3.9/amd64/Dockerfile @@ -10,6 +10,7 @@ RUN apk add --no-cache \ libssl1.1 \ libstdc++ \ lttng-ust \ + tzdata \ userspace-rcu \ zlib