From c51def62dffb4689159b09384197adea118b1b59 Mon Sep 17 00:00:00 2001
From: Charles Pretzer <charles@buoyant.io>
Date: Thu, 26 Sep 2019 12:30:59 -0700
Subject: [PATCH] Revert upgrade to buster based on CNI test failure after
 merge

---
 Dockerfile-base       | 2 +-
 Dockerfile-debug      | 2 +-
 Dockerfile-proxy      | 2 +-
 bin/docker-build-base | 2 +-
 bin/docker-pull-deps  | 2 +-
 bin/docker-push-deps  | 2 +-
 cni-plugin/Dockerfile | 2 +-
 web/Dockerfile        | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile-base b/Dockerfile-base
index 59cf634150306..326704520128d 100644
--- a/Dockerfile-base
+++ b/Dockerfile-base
@@ -3,7 +3,7 @@
 # This means that all Linkerd containers share a common set of tools, and furthermore, they
 # are highly cacheable at runtime.
 
-FROM debian:buster-20190910-slim
+FROM debian:stretch-20190812-slim
 
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
diff --git a/Dockerfile-debug b/Dockerfile-debug
index df71d1f65ff23..8c845d60bed3a 100644
--- a/Dockerfile-debug
+++ b/Dockerfile-debug
@@ -1,4 +1,4 @@
-FROM gcr.io/linkerd-io/base:2019-09-17.01
+FROM gcr.io/linkerd-io/base:2019-09-04.01
 RUN apt-get update && apt-get install -y --no-install-recommends \
     tcpdump \
     iproute2 \
diff --git a/Dockerfile-proxy b/Dockerfile-proxy
index 13a65f900adfb..ab53e7aac699f 100644
--- a/Dockerfile-proxy
+++ b/Dockerfile-proxy
@@ -1,4 +1,4 @@
-ARG RUNTIME_IMAGE=debian:buster-20190910-slim
+ARG RUNTIME_IMAGE=debian:stretch-20190812-slim
 
 FROM debian:stretch-20190812-slim as fetch
 RUN apt-get update && apt-get install -y ca-certificates curl
diff --git a/bin/docker-build-base b/bin/docker-build-base
index 48214d22ec2fd..b524757aac79f 100755
--- a/bin/docker-build-base
+++ b/bin/docker-build-base
@@ -14,7 +14,7 @@ rootdir="$( cd $bindir/.. && pwd )"
 
 . $bindir/_docker.sh
 
-tag="2019-09-17.01"
+tag="2019-09-04.01"
 
 if (docker_pull base "${tag}"); then
     echo "$(docker_repo base):${tag}"
diff --git a/bin/docker-pull-deps b/bin/docker-pull-deps
index 09abeaa1a9057..0a8ce12751fbb 100755
--- a/bin/docker-pull-deps
+++ b/bin/docker-pull-deps
@@ -7,5 +7,5 @@ bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 . $bindir/_docker.sh
 . $bindir/_tag.sh
 
-docker_pull base       2019-09-17.01       || true
+docker_pull base       2019-09-04.01       || true
 docker_pull go-deps    "$(go_deps_sha)"    || true
diff --git a/bin/docker-push-deps b/bin/docker-push-deps
index 18e8826445f21..77c4ce0195126 100755
--- a/bin/docker-push-deps
+++ b/bin/docker-push-deps
@@ -7,5 +7,5 @@ bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 . $bindir/_docker.sh
 . $bindir/_tag.sh
 
-docker_push base         2019-09-17.01
+docker_push base         2019-09-04.01
 docker_push go-deps      "$(go_deps_sha)"
diff --git a/cni-plugin/Dockerfile b/cni-plugin/Dockerfile
index 304a1068042cc..049cb95755bf5 100644
--- a/cni-plugin/Dockerfile
+++ b/cni-plugin/Dockerfile
@@ -6,7 +6,7 @@ COPY controller controller
 COPY cni-plugin cni-plugin
 RUN CGO_ENABLED=0 GOOS=linux go build -o /go/bin/linkerd-cni -v -mod=readonly ./cni-plugin/
 
-FROM gcr.io/linkerd-io/base:2019-09-17.01
+FROM gcr.io/linkerd-io/base:2019-09-04.01
 WORKDIR /linkerd
 RUN curl -kL -o $(which jq) https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
 COPY --from=golang /go/bin/linkerd-cni /opt/cni/bin/
diff --git a/web/Dockerfile b/web/Dockerfile
index 9eaa6747765c3..b25a050fda12c 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -32,7 +32,7 @@ COPY pkg pkg
 RUN CGO_ENABLED=0 GOOS=linux go build -mod=readonly -o web/web -ldflags "-s -w" ./web
 
 ## package it all up
-FROM debian:buster-20190910-slim
+FROM debian:stretch-20190812-slim
 WORKDIR /linkerd
 
 COPY LICENSE .