Merge pull request #535 from CodeCutterUK/multi-arch-build

Further improvements to the multi-arch build

.travis.yml

@@ -48,4 +48,4 @@ jobs:
       script:
         - echo $NAME:$VERSION_TAG
         - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-        - ./build-multiarch.sh
+        - make build_multiarch

Makefile

@@ -26,16 +26,19 @@ build:
 	./build.sh
 	docker build --no-cache -t $(NAME):$(VERSION_ARG) $(BUILD_ARG) --build-arg QEMU_ARCH=$(QEMU_ARCH) --platform $(PLATFORM) --rm image
 
+build_multiarch:
+	env NAME=$(NAME) VERSION=$(VERSION_ARG) ./build-multiarch.sh
+
 test:
 	env NAME=$(NAME) VERSION=$(VERSION_ARG) ./test/runner.sh
 
 tag_latest:
 	docker tag $(NAME):$(VERSION_ARG) $(NAME):$(LATEST_VERSION)
 
 tag_multiarch_latest:
-	env TAG_LATEST=true ./build-multiarch.sh
+	env NAME=$(NAME) VERSION=$(VERSION) TAG_LATEST=true ./build-multiarch.sh
 
-release: test tag_latest
+release: test
 	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION_ARG); then echo "$(NAME) version $(VERSION_ARG) is not yet built. Please run 'make build'"; false; fi
 	docker push $(NAME)
 	@echo "*** Don't forget to create a tag by creating an official GitHub release."

build-multiarch.sh

@@ -2,10 +2,7 @@
 set -e
 set -x
 
-if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then 
-
 for arch in $ARCHS; do
-    echo ${arch}
     docker pull $NAME:$VERSION-${arch}
 
     if [[ $TAG_LATEST != 'true' ]]; then 
@@ -23,5 +20,3 @@ if [[ $TAG_LATEST != 'true' ]]; then
 else
     docker manifest push $NAME:latest
 fi
-
-fi