From 227ddf91840f4f79946b54ef21a5806532fca951 Mon Sep 17 00:00:00 2001
From: Danny Sung <danny@dannysung.com>
Date: Sat, 13 Mar 2021 10:09:17 -0800
Subject: [PATCH 1/5] Travis: Include test for private doker registery

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 697575b..4fc5ada 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,11 @@ matrix:
       sudo: required
       services: docker
       env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=5.1
+    - os: linux
+      dist: xenial
+      sudo: required
+      services: docker
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 SWIFT_SNAPSHOT=5.3.3
     - os: linux
       dist: xenial
       sudo: required

From f6da6398cf7ac7b44185bbe33ff3dce0d9a6a80e Mon Sep 17 00:00:00 2001
From: Danny Sung <danny@dannysung.com>
Date: Sat, 13 Mar 2021 10:19:35 -0800
Subject: [PATCH 2/5] Travis: fix docker login

---
 build-package.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-package.sh b/build-package.sh
index 3097e36..80114e3 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -108,7 +108,8 @@ function travis_end () {
 #
 if [ -n "${DOCKER_IMAGE}" ]; then
   if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" -a $(echo "${DOCKER_IMAGE}" | egrep -c "^docker.kitura.net") -ne 0 ]; then
-    echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}"
+    echo ">> Docker login to private registry"
+    echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}" --password-stdin
   fi
 
   echo ">> Executing build in Docker container: ${DOCKER_IMAGE}"

From 3cd8665c459927627ca4cd78715aa75891443c9b Mon Sep 17 00:00:00 2001
From: Danny Sung <danny@dannysung.com>
Date: Sat, 13 Mar 2021 10:30:31 -0800
Subject: [PATCH 3/5] Update check for docker login credentials; emit error if
 missing

---
 build-package.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build-package.sh b/build-package.sh
index 80114e3..bda6059 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -107,9 +107,13 @@ function travis_end () {
 # Additional packages can be installed by listing them in DOCKER_PACKAGES.
 #
 if [ -n "${DOCKER_IMAGE}" ]; then
-  if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" -a $(echo "${DOCKER_IMAGE}" | egrep -c "^docker.kitura.net") -ne 0 ]; then
-    echo ">> Docker login to private registry"
-    echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}" --password-stdin
+  if [ $(echo "${DOCKER_IMAGE}" | egrep -c "^docker.kitura.net") -ne 0 ]; then
+    if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" -a  ]; then
+      echo ">> Docker login to private registry"
+      echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}" --password-stdin
+    else
+      echo "Error: Expected KITURA_DOCKER_USER && KITURA_DOCKER_PASSWORD environment variables."
+    fi
   fi
 
   echo ">> Executing build in Docker container: ${DOCKER_IMAGE}"

From 3574eafbd08cce675ea35d5d7c1bdf958bb4da04 Mon Sep 17 00:00:00 2001
From: Danny Sung <danny@dannysung.com>
Date: Sat, 13 Mar 2021 10:32:49 -0800
Subject: [PATCH 4/5] fix typo

---
 build-package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-package.sh b/build-package.sh
index bda6059..34f7cc3 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -108,7 +108,7 @@ function travis_end () {
 #
 if [ -n "${DOCKER_IMAGE}" ]; then
   if [ $(echo "${DOCKER_IMAGE}" | egrep -c "^docker.kitura.net") -ne 0 ]; then
-    if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" -a  ]; then
+    if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" ]; then
       echo ">> Docker login to private registry"
       echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}" --password-stdin
     else

From 30a76b85efd8dd26832f48cbe43ec2e9ea089607 Mon Sep 17 00:00:00 2001
From: Danny Sung <danny@dannysung.com>
Date: Sat, 13 Mar 2021 10:51:27 -0800
Subject: [PATCH 5/5] Remove private docker login requirement

---
 build-package.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/build-package.sh b/build-package.sh
index 34f7cc3..cf27a64 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -107,15 +107,6 @@ function travis_end () {
 # Additional packages can be installed by listing them in DOCKER_PACKAGES.
 #
 if [ -n "${DOCKER_IMAGE}" ]; then
-  if [ $(echo "${DOCKER_IMAGE}" | egrep -c "^docker.kitura.net") -ne 0 ]; then
-    if [ ! -z "${KITURA_DOCKER_USER}" -a ! -z "${KITURA_DOCKER_PASSWORD}" ]; then
-      echo ">> Docker login to private registry"
-      echo "${KITURA_DOCKER_PASSWORD}" | docker login docker.kitura.net -u "${KITURA_DOCKER_USER}" --password-stdin
-    else
-      echo "Error: Expected KITURA_DOCKER_USER && KITURA_DOCKER_PASSWORD environment variables."
-    fi
-  fi
-
   echo ">> Executing build in Docker container: ${DOCKER_IMAGE}"
   # Check if privileged mode has been requested for
   if [ -n "${DOCKER_PRIVILEGED}" ]; then