From 1833ad0eb56b4652a42db3a78a3125d11e06f557 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 1 Nov 2017 20:57:32 +0100 Subject: [PATCH] Build armv6 variant --- Dockerfile | 2 ++ travis-deploy.sh | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e90e083..c2941d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ ARG arch=amd64 COPY . /code WORKDIR /code +ENV GOARM 6 + RUN CGO_ENABLED=0 GOOS=linux GOARCH=$arch go build -a -installsuffix cgo http.go FROM scratch diff --git a/travis-deploy.sh b/travis-deploy.sh index b460581..3ec52cc 100755 --- a/travis-deploy.sh +++ b/travis-deploy.sh @@ -45,8 +45,8 @@ if [ "$ARCH" == "amd64" ]; then "$image:linux-arm64-$TRAVIS_TAG" \ "$image:windows-amd64-$TRAVIS_TAG" \ "$image:windows-amd64-$TRAVIS_TAG-1709" - ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm - ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 + ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6 + ./docker manifest annotate "$image:$TRAVIS_TAG" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8 ./docker manifest push "$image:$TRAVIS_TAG" echo "Pushing manifest $image:latest" @@ -56,7 +56,7 @@ if [ "$ARCH" == "amd64" ]; then "$image:linux-arm64-$TRAVIS_TAG" \ "$image:windows-amd64-$TRAVIS_TAG" \ "$image:windows-amd64-$TRAVIS_TAG-1709" - ./docker manifest annotate "$image:latest" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm - ./docker manifest annotate "$image:latest" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 + ./docker manifest annotate "$image:latest" "$image:linux-arm-$TRAVIS_TAG" --os linux --arch arm --variant v6 + ./docker manifest annotate "$image:latest" "$image:linux-arm64-$TRAVIS_TAG" --os linux --arch arm64 --variant v8 ./docker manifest push "$image:latest" fi