From 3f323c2c66d947a1d22d7718e2c7a3b1fc944df1 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 4 Apr 2019 15:33:16 -0400
Subject: [PATCH] Drop the separate Tor-enabled Debian image.

Just install Tor on the other Debian image and re-use that.
---
 .circleci/Dockerfile.debian       |  5 +++++
 .circleci/Dockerfile.debian-9-tor |  3 ---
 .circleci/config.yml              | 12 ------------
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 .circleci/Dockerfile.debian-9-tor

diff --git a/.circleci/Dockerfile.debian b/.circleci/Dockerfile.debian
index 228841e78..ce9f61a3b 100644
--- a/.circleci/Dockerfile.debian
+++ b/.circleci/Dockerfile.debian
@@ -23,3 +23,8 @@ RUN apt-get --quiet update && \
 COPY . ${BUILD_SRC_ROOT}
 
 RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
+
+# Only the integration tests currently need this but it doesn't hurt to always
+# have it present and it's simpler than building a whole extra image just for
+# the integration tests.
+RUN ${BUILD_SRC_ROOT}/integration/install-tor.sh
diff --git a/.circleci/Dockerfile.debian-9-tor b/.circleci/Dockerfile.debian-9-tor
deleted file mode 100644
index 9b8385a37..000000000
--- a/.circleci/Dockerfile.debian-9-tor
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM tahoelafsci/debian:9
-
-RUN ${BUILD_SRC_ROOT}/integration/install-tor.sh
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d9a980a93..2a68cdf43 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -166,10 +166,6 @@ jobs:
   integration:
     <<: *DEBIAN
 
-    docker:
-      - image: "tahoelafsci/debian:9-tor"
-        user: "nobody"
-
     environment:
       <<: *UTF_8_ENVIRONMENT
       # Select the integration tests tox environments.
@@ -409,11 +405,3 @@ jobs:
             # Dockerhub web interface) before anything can be pushed to it.
             docker push tahoelafsci/fedora:28
             docker push tahoelafsci/fedora:29
-      - run:
-          name: "Build Tor-enabled image"
-          command: |
-            docker build -t tahoelafsci/debian:9-tor -f ~/project/.circleci/Dockerfile.debian-9-tor ~/project/
-      - run:
-          name: "Push Tor-enabled image"
-          command: |
-            docker push tahoelafsci/debian:9-tor