From 87f9340ea4b85b6ffada26d40e8a7ca99ef74a03 Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@videolan.org>
Date: Tue, 21 Apr 2020 16:37:37 +0300
Subject: [PATCH] Provide curl inside images to simplify service discovery
registration
Fixes #378.
---
mainline/alpine-perl/Dockerfile | 2 ++
mainline/alpine/Dockerfile | 2 ++
mainline/buster-perl/Dockerfile | 3 ++-
mainline/buster/Dockerfile | 3 ++-
stable/alpine-perl/Dockerfile | 2 ++
stable/alpine/Dockerfile | 2 ++
stable/buster-perl/Dockerfile | 3 ++-
stable/buster/Dockerfile | 3 ++-
8 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
index 64ecd48..1d46a0c 100644
--- a/mainline/alpine-perl/Dockerfile
+++ b/mainline/alpine-perl/Dockerfile
@@ -100,6 +100,8 @@ RUN set -x \
# Bring in tzdata so users could set the timezones through the environment
# variables
&& apk add --no-cache tzdata \
+# Bring in curl and ca-certificates to make registering on DNS SD easier
+ && apk add --no-cache curl ca-certificates \
# forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
index d7ec4c4..5d3bea9 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -99,6 +99,8 @@ RUN set -x \
# Bring in tzdata so users could set the timezones through the environment
# variables
&& apk add --no-cache tzdata \
+# Bring in curl and ca-certificates to make registering on DNS SD easier
+ && apk add --no-cache curl ca-certificates \
# forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \
diff --git a/mainline/buster-perl/Dockerfile b/mainline/buster-perl/Dockerfile
index af72698..eabb722 100644
--- a/mainline/buster-perl/Dockerfile
+++ b/mainline/buster-perl/Dockerfile
@@ -85,7 +85,8 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y \
$nginxPackages \
gettext-base \
- && apt-get remove --purge --auto-remove -y ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
+ curl \
+ && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
\
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then \
diff --git a/mainline/buster/Dockerfile b/mainline/buster/Dockerfile
index 3394318..4c2cc9a 100644
--- a/mainline/buster/Dockerfile
+++ b/mainline/buster/Dockerfile
@@ -84,7 +84,8 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y \
$nginxPackages \
gettext-base \
- && apt-get remove --purge --auto-remove -y ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
+ curl \
+ && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
\
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then \
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
index 213f33f..e094aca 100644
--- a/stable/alpine-perl/Dockerfile
+++ b/stable/alpine-perl/Dockerfile
@@ -100,6 +100,8 @@ RUN set -x \
# Bring in tzdata so users could set the timezones through the environment
# variables
&& apk add --no-cache tzdata \
+# Bring in curl and ca-certificates to make registering on DNS SD easier
+ && apk add --no-cache curl ca-certificates \
# forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \
diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
index debe3ac..517fc64 100644
--- a/stable/alpine/Dockerfile
+++ b/stable/alpine/Dockerfile
@@ -99,6 +99,8 @@ RUN set -x \
# Bring in tzdata so users could set the timezones through the environment
# variables
&& apk add --no-cache tzdata \
+# Bring in curl and ca-certificates to make registering on DNS SD easier
+ && apk add --no-cache curl ca-certificates \
# forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \
diff --git a/stable/buster-perl/Dockerfile b/stable/buster-perl/Dockerfile
index 72c0c92..890a455 100644
--- a/stable/buster-perl/Dockerfile
+++ b/stable/buster-perl/Dockerfile
@@ -85,7 +85,8 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y \
$nginxPackages \
gettext-base \
- && apt-get remove --purge --auto-remove -y ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
+ curl \
+ && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
\
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then \
diff --git a/stable/buster/Dockerfile b/stable/buster/Dockerfile
index 8049d48..d14be02 100644
--- a/stable/buster/Dockerfile
+++ b/stable/buster/Dockerfile
@@ -84,7 +84,8 @@ RUN set -x \
&& apt-get install --no-install-recommends --no-install-suggests -y \
$nginxPackages \
gettext-base \
- && apt-get remove --purge --auto-remove -y ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
+ curl \
+ && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
\
# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
&& if [ -n "$tempDir" ]; then \
--
GitLab