From 9773b1d53c9a2828fc0e116f3e7ee1849e7963e6 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 23 Oct 2019 18:13:55 -0700
Subject: [PATCH] Add Python 3.8 to some docker images

---
 docker/build/ubuntu-16.04/Dockerfile | 5 +++--
 docker/build/ubuntu-18.04/Dockerfile | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker/build/ubuntu-16.04/Dockerfile b/docker/build/ubuntu-16.04/Dockerfile
index 3b7c7224..81672534 100644
--- a/docker/build/ubuntu-16.04/Dockerfile
+++ b/docker/build/ubuntu-16.04/Dockerfile
@@ -47,7 +47,7 @@ RUN \
         if [ ${USE_DEADSNAKES} = yes ]; then add-apt-repository ppa:deadsnakes/ppa; apt-get update; fi; \
         apt-get install -y python2.7 python2.7-dev libpython2.7-dev python-virtualenv; \
         apt-get install -y python3.6 python3.6-dev libpython3.6-dev python3.6-venv; \
-        apt-get install -y python3.7 python3.7-dev libpython3.7-dev python3.7-venv; \
+        apt-get install -y python3.8 python3.8-dev libpython3.8-dev python3.8-venv; \
         apt-get clean;
 
 # Set the user and group to use for the rest of the commands
@@ -62,7 +62,8 @@ RUN \
         mkdir -p ${HOME}/venvs; \
         virtualenv --python=python2.7 venvs/Py27; \
         python3.6 -m venv venvs/Py36; \
-        python3.7 -m venv venvs/Py37; 
+        python3.7 -m venv venvs/Py37; \
+        python3.8 -m venv venvs/Py38;
 
 # Add files from host into the container
 COPY scripts ${HOME}/bin
diff --git a/docker/build/ubuntu-18.04/Dockerfile b/docker/build/ubuntu-18.04/Dockerfile
index e373de53..c5174789 100644
--- a/docker/build/ubuntu-18.04/Dockerfile
+++ b/docker/build/ubuntu-18.04/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:18.04
 
 # Set environment variables
 ENV DIST_NAME=ubuntu-18.04
-ENV USE_DEADSNAKES=no
+ENV USE_DEADSNAKES=yes
 ENV USER=wxpy
 ENV HOME=/home/$USER
 ENV PYTHONUNBUFFERED=1
@@ -52,6 +52,7 @@ RUN \
         apt-get install -y python2.7 python2.7-dev libpython2.7-dev python-virtualenv; \
         apt-get install -y python3.6 python3.6-dev libpython3.6-dev python3.6-venv; \
         apt-get install -y python3.7 python3.7-dev libpython3.7-dev python3.7-venv; \
+        apt-get install -y python3.8 python3.8-dev libpython3.8-dev python3.8-venv; \
         apt-get clean;
 
 # Add files from host into the container
@@ -70,7 +71,8 @@ RUN \
         mkdir -p ${HOME}/venvs; \
         virtualenv --python=python2.7 venvs/Py27; \
         python3.6 -m venv venvs/Py36; \
-        python3.7 -m venv venvs/Py37; 
+        python3.7 -m venv venvs/Py37; \
+        python3.8 -m venv venvs/Py38;
 
 # Define default command
 CMD ["/bin/bash", "-l"]