Merge branch 'main' into ff-multiarch

shahmishal · web-flow · commit 38e6a4e9f184 · 2021-08-18T15:12:27.000-07:00
diff --git a/5.1/ubuntu/16.04/Dockerfile b/5.1/ubuntu/16.04/Dockerfile
@@ -47,7 +47,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.1/ubuntu/16.04/slim/Dockerfile b/5.1/ubuntu/16.04/slim/Dockerfile
@@ -37,7 +37,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.1/ubuntu/18.04/Dockerfile b/5.1/ubuntu/18.04/Dockerfile
@@ -47,7 +47,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.1/ubuntu/18.04/slim/Dockerfile b/5.1/ubuntu/18.04/slim/Dockerfile
@@ -37,7 +37,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.2/amazonlinux/2/Dockerfile b/5.2/amazonlinux/2/Dockerfile
@@ -44,7 +44,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.2/amazonlinux/2/slim/Dockerfile b/5.2/amazonlinux/2/slim/Dockerfile
@@ -26,7 +26,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && yum -y install tar gzip \
diff --git a/5.2/centos/7/Dockerfile b/5.2/centos/7/Dockerfile
@@ -43,7 +43,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.2/centos/7/slim/Dockerfile b/5.2/centos/7/slim/Dockerfile
@@ -26,7 +26,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.2/centos/8/Dockerfile b/5.2/centos/8/Dockerfile
@@ -45,7 +45,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.2/centos/8/slim/Dockerfile b/5.2/centos/8/slim/Dockerfile
@@ -26,7 +26,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.2/ubuntu/16.04/Dockerfile b/5.2/ubuntu/16.04/Dockerfile
@@ -47,7 +47,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.2/ubuntu/16.04/slim/Dockerfile b/5.2/ubuntu/16.04/slim/Dockerfile
@@ -37,7 +37,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.2/ubuntu/18.04/Dockerfile b/5.2/ubuntu/18.04/Dockerfile
@@ -47,7 +47,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.4/amazonlinux/2/Dockerfile b/5.4/amazonlinux/2/Dockerfile
@@ -44,7 +44,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.4/amazonlinux/2/slim/Dockerfile b/5.4/amazonlinux/2/slim/Dockerfile
@@ -26,7 +26,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && yum -y install tar gzip \
diff --git a/5.4/centos/7/Dockerfile b/5.4/centos/7/Dockerfile
@@ -43,7 +43,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.4/centos/7/slim/Dockerfile b/5.4/centos/7/slim/Dockerfile
@@ -26,7 +26,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.4/centos/8/Dockerfile b/5.4/centos/8/Dockerfile
@@ -45,7 +45,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.4/centos/8/slim/Dockerfile b/5.4/centos/8/slim/Dockerfile
@@ -26,7 +26,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.4/ubuntu/16.04/Dockerfile b/5.4/ubuntu/16.04/Dockerfile
@@ -47,7 +47,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.4/ubuntu/16.04/slim/Dockerfile b/5.4/ubuntu/16.04/slim/Dockerfile
@@ -37,7 +37,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.4/ubuntu/18.04/Dockerfile b/5.4/ubuntu/18.04/Dockerfile
@@ -47,7 +47,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.4/ubuntu/18.04/slim/Dockerfile b/5.4/ubuntu/18.04/slim/Dockerfile
@@ -37,7 +37,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/5.4/ubuntu/20.04/Dockerfile b/5.4/ubuntu/20.04/Dockerfile
@@ -48,7 +48,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 \
diff --git a/5.4/ubuntu/20.04/slim/Dockerfile b/5.4/ubuntu/20.04/slim/Dockerfile
@@ -36,7 +36,7 @@ RUN set -e; \
     # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
     && export GNUPGHOME="$(mktemp -d)" \
     && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
-    && gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
+    && curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
     && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
     # - Unpack the toolchain, set libs permissions, and clean up.
     && tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
diff --git a/ci_test.py b/ci_test.py
@@ -13,10 +13,13 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+import urllib2
+import json
 import subprocess
 import sys
 import os
 
+
 def run_command(cmd, log_file=None):
     print("Running: {}".format(cmd))
     sys.stdout.flush()
@@ -32,12 +35,18 @@ def run_command(cmd, log_file=None):
 
 def get_dockerfiles():
     dockerfiles = []
-    docker_dir = os.path.dirname(os.path.realpath(__file__))
-    for root, dirs, files in os.walk(docker_dir):
-        for file in files:
-            if file == "Dockerfile":
-                dockerfiles.append(root)
-    dockerfiles.sort(reverse=True)
+    GITHUB_API_URL = "https://api.github.com"
+    response = urllib2.urlopen("{}/repos/{}/pulls/{}/files".format(GITHUB_API_URL,
+                                                                   os.environ['ghprbGhRepository'],
+                                                                   os.environ['ghprbPullId']))
+    data = json.load(response)
+
+    for file_info in data:
+        filename = file_info['filename']
+        print(filename)
+        if "Dockerfile" in filename:
+            file_dir = filename.replace("Dockerfile", "")
+            dockerfiles.append(file_dir)
     return dockerfiles
 
 
diff --git a/swift-ci/master/ubuntu/18.04/Dockerfile b/swift-ci/master/ubuntu/18.04/Dockerfile
@@ -1,13 +1,12 @@
-FROM ubuntu:19.10
+FROM ubuntu:18.04
 
 RUN groupadd -g 998 build-user && \
     useradd -m -r -u 998 -g build-user build-user
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
-RUN apt update
-
-RUN apt -y install      \
+RUN apt -y update && apt -y install \
+  build-essential       \
   clang                 \
   cmake                 \
   git                   \
@@ -16,13 +15,15 @@ RUN apt -y install      \
   libedit-dev           \
   libicu-dev            \
   libncurses5-dev       \
-  libpython-dev         \
+  libpython3-dev        \
   libsqlite3-dev        \
   libxml2-dev           \
   ninja-build           \
   pkg-config            \
   python                \
   python-six            \
+  python3-six           \
+  python3-distutils     \
   rsync                 \
   swig                  \
   systemtap-sdt-dev     \
@@ -32,4 +33,4 @@ RUN apt -y install      \
 
 USER build-user
 
-WORKDIR /home/build-user
+WORKDIR /home/build-user
diff --git a/swift-ci/master/ubuntu/20.04/Dockerfile b/swift-ci/master/ubuntu/20.04/Dockerfile
@@ -5,7 +5,7 @@ RUN groupadd -g 998 build-user && \
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
-RUN apt -y update && apt -y install \
+RUN apt-get -y update && apt-get -y install \
   build-essential       \
   clang                 \
   cmake                 \
