Merge pull request #44 from infosiftr/travis-i386

Add i386 testing in Travis

Author: tianon

.travis.yml

@@ -3,24 +3,34 @@ 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:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
 
 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:

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