From 65279961492619bf3afd1fa6fa010df59bd7164a Mon Sep 17 00:00:00 2001
From: Nicholas Johns <taion809@users.noreply.github.com>
Date: Tue, 3 Apr 2018 13:05:38 -0400
Subject: [PATCH] Docker: Improve Published Docker Images (#2850)

This is an initial update to the docker images that are created
and published to hub.dockerhub.com.

The purpose is to provide users with an image that can be ready
to run from the moment they issue docker pull.

Signed-off-by: Nicholas Johns <nicholas.a.johns5@gmail.com>
---
 ci/Dockerfile-envoy-alpine       | 14 ++++++++++++++
 ci/Dockerfile-envoy-alpine-debug | 14 ++++++++++++++
 ci/Dockerfile-envoy-image        | 23 +++++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/ci/Dockerfile-envoy-alpine b/ci/Dockerfile-envoy-alpine
index 82d8287264a3..9d5e6e263e94 100644
--- a/ci/Dockerfile-envoy-alpine
+++ b/ci/Dockerfile-envoy-alpine
@@ -1,3 +1,17 @@
 FROM frolvlad/alpine-glibc
 
+ENV loglevel=info
+
+RUN apk upgrade --update-cache \
+    && apk add dumb-init \
+    && rm -rf /var/cache/apk/*
+
+RUN mkdir -p /etc/envoy
+
 ADD build_release_stripped/envoy /usr/local/bin/envoy
+ADD configs/google_com_proxy.v2.yaml /etc/envoy/envoy.yaml
+
+EXPOSE 10000
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD /usr/local/bin/envoy --v2-config-only -l $loglevel -c /etc/envoy/envoy.yaml
diff --git a/ci/Dockerfile-envoy-alpine-debug b/ci/Dockerfile-envoy-alpine-debug
index 7cef9e93f99c..3030b9f9d0f5 100644
--- a/ci/Dockerfile-envoy-alpine-debug
+++ b/ci/Dockerfile-envoy-alpine-debug
@@ -1,3 +1,17 @@
 FROM frolvlad/alpine-glibc
 
+ENV loglevel=info
+
+RUN apk upgrade --update-cache \
+    && apk add dumb-init \
+    && rm -rf /var/cache/apk/*
+
+RUN mkdir -p /etc/envoy
+
 ADD build_release/envoy /usr/local/bin/envoy
+ADD configs/google_com_proxy.v2.yaml /etc/envoy/envoy.yaml
+
+EXPOSE 10000
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD /usr/local/bin/envoy --v2-config-only -l $loglevel -c /etc/envoy/envoy.yaml
diff --git a/ci/Dockerfile-envoy-image b/ci/Dockerfile-envoy-image
index beb0f24052eb..2c7b820bea0b 100644
--- a/ci/Dockerfile-envoy-image
+++ b/ci/Dockerfile-envoy-image
@@ -1,3 +1,26 @@
 FROM ubuntu:16.04
 
+ARG dumbinit_version=1.2.1
+ENV loglevel=info
+
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y wget ca-certificates \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /tmp/* /var/tmp/* \
+    && rm -rf /var/lib/apt/lists/*
+
+
+RUN wget https://github.com/Yelp/dumb-init/releases/download/v${dumbinit_version}/dumb-init_${dumbinit_version}_amd64.deb \
+    && dpkg -i dumb-init_${dumbinit_version}_amd64.deb
+
+RUN mkdir -p /etc/envoy
+
 ADD build_release_stripped/envoy /usr/local/bin/envoy
+ADD configs/google_com_proxy.v2.yaml /etc/envoy/envoy.yaml
+
+EXPOSE 10000
+
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD /usr/local/bin/envoy --v2-config-only -l $loglevel -c /etc/envoy/envoy.yaml