From cc3311521841bb4183f9a315176b2fab5442bc35 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 4 Apr 2019 14:28:04 -0400
Subject: [PATCH] Parameterize the Debian version

---
 ...{Dockerfile.debian-8 => Dockerfile.debian} |  3 ++-
 .circleci/Dockerfile.debian-9                 | 24 -------------------
 .circleci/config.yml                          |  4 ++--
 3 files changed, 4 insertions(+), 27 deletions(-)
 rename .circleci/{Dockerfile.debian-8 => Dockerfile.debian} (96%)
 delete mode 100644 .circleci/Dockerfile.debian-9

diff --git a/.circleci/Dockerfile.debian-8 b/.circleci/Dockerfile.debian
similarity index 96%
rename from .circleci/Dockerfile.debian-8
rename to .circleci/Dockerfile.debian
index ae6845d73..228841e78 100644
--- a/.circleci/Dockerfile.debian-8
+++ b/.circleci/Dockerfile.debian
@@ -1,4 +1,5 @@
-FROM debian:8
+ARG TAG
+FROM debian:${TAG}
 
 ENV WHEELHOUSE_PATH /tmp/wheelhouse
 ENV VIRTUALENV_PATH /tmp/venv
diff --git a/.circleci/Dockerfile.debian-9 b/.circleci/Dockerfile.debian-9
deleted file mode 100644
index d5d01f7ff..000000000
--- a/.circleci/Dockerfile.debian-9
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM debian:9
-
-ENV WHEELHOUSE_PATH /tmp/wheelhouse
-ENV VIRTUALENV_PATH /tmp/venv
-# This will get updated by the CircleCI checkout step.
-ENV BUILD_SRC_ROOT /tmp/project
-
-RUN apt-get --quiet update && \
-    apt-get --quiet --yes install git && \
-    apt-get --quiet --yes install \
-        sudo \
-    	build-essential \
-	python2.7 \
-    	python2.7-dev \
-    	libffi-dev \
-    	libssl-dev \
-    	libyaml-dev \
-    	virtualenv
-
-# Get the project source.  Copying in the whole project source here isn't very
-# cache friendly but there's no Docker layer cache on CircleCI anyway!
-COPY . ${BUILD_SRC_ROOT}
-
-RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56200978a..bfd6ba8a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -366,8 +366,8 @@ jobs:
       - run:
           name: "Build Debian images"
           command: |
-            docker build -t tahoelafsci/debian:8 -f ~/project/.circleci/Dockerfile.debian-8 ~/project/
-            docker build -t tahoelafsci/debian:9 -f ~/project/.circleci/Dockerfile.debian-9 ~/project/
+            docker build --build-arg TAG=8 -t tahoelafsci/debian:8 -f ~/project/.circleci/Dockerfile.debian ~/project/
+            docker build --build-arg TAG=9 -t tahoelafsci/debian:9 -f ~/project/.circleci/Dockerfile.debian ~/project/
       - run:
           name: "Push Debian images"
           command: |