From 02081b585bda0c9232a7e26efafdb41c6972c826 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 1 May 2020 13:38:21 -0500
Subject: [PATCH] Build zuul images with python 3.8

We suspect a memory leak in python 3.7. BMW saw one and reverted
to 3.6 and has been better. OpenDev is seeing one which seems to
be improved by sending SIGUSR2 signals to the process, which makes
us think there may be an issue in the GC.

Try updating to 3.8. If it fixes it, we can just shrug and say
"3.7 lol". If it doesn't, we can follow BMW's lead and try 3.6.

Change-Id: Iaa53fa2b3125dd3a2c79ba25191b2b44ed473200
---
 .zuul.yaml | 8 ++++----
 Dockerfile | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 3084e68fb4..a2c34b51ec 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -130,8 +130,8 @@
     allowed-projects: zuul/zuul
     timeout: 2700  # 45 minutes
     requires:
-      - python-builder-container-image
-      - python-base-container-image
+      - python-builder-3.8-container-image
+      - python-base-3.8-container-image
     provides: zuul-container-image
     vars: &zuul_image_vars
       docker_images:
@@ -160,8 +160,8 @@
     description: Build Docker images and upload to Docker Hub.
     allowed-projects: zuul/zuul
     requires:
-      - python-builder-container-image
-      - python-base-container-image
+      - python-builder-3.8-container-image
+      - python-base-3.8-container-image
     provides: zuul-container-image
     secrets:
       name: docker_credentials
diff --git a/Dockerfile b/Dockerfile
index 45419c6c88..96c323217d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM docker.io/opendevorg/python-builder as builder
+FROM docker.io/opendevorg/python-builder:3.8 as builder
 
 # Optional location of Zuul API endpoint.
 ARG REACT_APP_ZUUL_API
@@ -39,7 +39,7 @@ RUN mkdir /tmp/openshift-install \
   && echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
   && tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install
 
-FROM docker.io/opendevorg/python-base as zuul
+FROM docker.io/opendevorg/python-base:3.8 as zuul
 
 COPY --from=builder /output/ /output
 RUN /output/install-from-bindep \