From a5acda95ff42ab130cfb24130547321acd2afa2a Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 21 Feb 2020 22:07:09 -0600
Subject: [PATCH] Default to python 2 still for backwards compatibility.

---
 .travis.yml                 | 6 +++---
 provisioning/docker/bake.sh | 3 ++-
 tests/run-tests.sh          | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a192d0c95..595ada624 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,17 +20,20 @@ env:
     # Defaults - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
+      tag: python2
     # Defaults - Debian 9.
     - type: debian
       distro: debian9
     # Defaults - CentOS 7.
     - type: centos
       distro: centos7
+      tag: python2
       local_config: tests/centos-7.config.yml
 
     # PHP 7.3 - Ubuntu 18.04.
     - type: defaults
       distro: ubuntu1804
+      tag: python2
       local_config: tests/ubuntu-18-php73.config.yml
       DRUSH_BIN: "${DRUPALVM_DIR}/drupal/vendor/bin/drush"
       TEST_INSTALLED_EXTRAS: false
@@ -51,9 +54,6 @@ env:
     #   TEST_INSTALLED_EXTRAS: false
 
 before_install:
-  # Pull container.
-  - docker pull geerlingguy/docker-${distro}-ansible:latest
-
   # Install lint tools.
   - gem install rubocop
 
diff --git a/provisioning/docker/bake.sh b/provisioning/docker/bake.sh
index 36f60133f..aa65098df 100755
--- a/provisioning/docker/bake.sh
+++ b/provisioning/docker/bake.sh
@@ -15,6 +15,7 @@ DRUPALVM_HTTP_PORT="${DRUPALVM_HTTP_PORT:-80}"
 DRUPALVM_HTTPS_PORT="${DRUPALVM_HTTPS_PORT:-443}"
 
 DISTRO="${DISTRO:-ubuntu1804}"
+TAG="${TAG:-python2}"
 OPTS="${OPTS:---privileged}"
 INIT="${INIT:-/lib/systemd/systemd}"
 
@@ -41,7 +42,7 @@ docker run --name=$DRUPALVM_MACHINE_NAME -d \
   -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTP_PORT:80 \
   -p $DRUPALVM_IP_ADDRESS:$DRUPALVM_HTTPS_PORT:443 \
   $OPTS \
-  geerlingguy/docker-$DISTRO-ansible:latest \
+  geerlingguy/docker-$DISTRO-ansible:$TAG \
   $INIT
 
 # Create Drupal directory.
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index 21f7b96e7..0cc6a849f 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -15,6 +15,7 @@ TEST_INSTALLED_EXTRAS="${TEST_INSTALLED_EXTRAS:-true}"
 CONTAINER_ID="${CONTAINER_ID:-dvm-test}"
 type="${type:-tests/defaults}"
 distro="${distro:-ubuntu1604}"
+tag="${tag:-latest}"
 cleanup="${cleanup:-true}"
 
 ## Set up vars for Docker setup.
@@ -81,7 +82,7 @@ docker run --name=$CONTAINER_ID -d \
   --add-host "$HOSTNAME  drupalvm":127.0.0.1 \
   -v $PWD:/var/www/drupalvm/:$volume_opts \
   $opts \
-  geerlingguy/docker-$distro-ansible:latest \
+  geerlingguy/docker-$distro-ansible:$tag \
   $init
 
 # Set up directories.