From 53d42f7c4b27bac8cf0faaf96d6063b8db356a1c Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 5 Sep 2017 10:17:52 -0700
Subject: [PATCH] Add i386 testing in Travis

---
 .travis.yml | 14 ++++++++++++--
 update.sh   |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0060b2bc..e7d9d698 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,12 +3,16 @@ services: docker
 
 env:
   - VERSION=1.7 VARIANT=
+  - VERSION=1.7 ARCH=i386
   - VERSION=1.7 VARIANT=alpine
   - VERSION=1.6 VARIANT=
+  - VERSION=1.6 ARCH=i386
   - VERSION=1.6 VARIANT=alpine
   - VERSION=1.5 VARIANT=
+  - VERSION=1.5 ARCH=i386
   - VERSION=1.5 VARIANT=alpine
   - VERSION=1.4 VARIANT=
+  - VERSION=1.4 ARCH=i386
   - VERSION=1.4 VARIANT=alpine
 
 install:
@@ -16,11 +20,17 @@ install:
 
 before_script:
   - env | sort
-  - cd "$VERSION"
+  - cd "$VERSION${VARIANT+/$VARIANT}"
   - image="haproxy:${VERSION}${VARIANT+-$VARIANT}"
+  - |
+    if [ -n "$ARCH" ]; then
+        from="$(awk '$1 == toupper("FROM") { print $2 }' Dockerfile)"
+        docker pull "$ARCH/$from"
+        docker tag "$ARCH/$from" "$from"
+    fi
 
 script:
-  - travis_retry docker build -t "$image" "${VARIANT:-.}"
+  - travis_retry docker build -t "$image" .
   - ~/official-images/test/run.sh "$image"
 
 after_script:
diff --git a/update.sh b/update.sh
index f1ba4d75..4955c99d 100755
--- a/update.sh
+++ b/update.sh
@@ -9,7 +9,6 @@ if [ ${#versions[@]} -eq 0 ]; then
 fi
 versions=( "${versions[@]%/}" )
 
-
 travisEnv=
 for version in "${versions[@]}"; do
 	fullVersion="$(curl -sSL --compressed 'http://www.haproxy.org/download/'"$version"'/src/' | grep '<a href="haproxy-'"$version"'.*\.tar\.gz"' | sed -r 's!.*<a href="haproxy-([^"/]+)\.tar\.gz".*!\1!' | sort -V | tail -1)"
@@ -26,6 +25,7 @@ for version in "${versions[@]}"; do
 		( set -x; sed -ri "$sedExpr" "$version/$variant/Dockerfile" )
 		travisEnv='\n  - VERSION='"$version VARIANT=$variant$travisEnv"
 	done
+	travisEnv='\n  - VERSION='"$version ARCH=i386$travisEnv"
 	travisEnv='\n  - VERSION='"$version VARIANT=$travisEnv"
 done