From cb9b9f8fc4a5709f9dbf5ec2617c39197d34ea79 Mon Sep 17 00:00:00 2001
From: "Alex Ellis (OpenFaaS Ltd)" <alexellis2@gmail.com>
Date: Thu, 29 Oct 2020 17:32:26 +0000
Subject: [PATCH] Add Docker upgrade script

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
---
 .travis.yml            | 10 +---------
 Makefile               | 12 +++++++++++-
 hack/install-docker.sh | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100755 hack/install-docker.sh

diff --git a/.travis.yml b/.travis.yml
index f2be4b56..13f04af4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,7 @@ script:
 - TAG=${TRAVIS_TAG:=latest} make docker
 
 before_script:
-  - sudo rm -rf /var/lib/apt/lists/*
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) edge"
-  - sudo apt-get update -qy
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - mkdir -vp ~/.docker/cli-plugins/
-  - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
-  - chmod a+x ~/.docker/cli-plugins/docker-buildx
-  - sudo systemctl start docker
+  - ./hack/install-docker.sh
   - ./hack/install-buildx.sh
 
 after_success:
diff --git a/Makefile b/Makefile
index ea5d8b94..11a64fca 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,16 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
 .PHONY: all
 all: build
 
+.PHONY: build-local
+build-local:
+	@docker buildx create --use --name=multiarch --node multiarch && \
+	docker buildx build \
+		--progress=plain \
+		--build-arg VERSION=$(Version) --build-arg GIT_COMMIT=$(GitCommit) \
+		--platform linux/amd64 \
+		--output "type=docker,push=false" \
+		--tag inlets/inlets-operator:$(TAG) .
+
 .PHONY: build
 build:
 	@docker buildx create --use --name=multiarch --node multiarch && \
@@ -35,7 +45,7 @@ push:
 	docker buildx build \
 		--progress=plain \
 		--build-arg VERSION=$(Version) --build-arg GIT_COMMIT=$(GitCommit) \
-		--platform linux/amd64,true/arm/v6,linux/arm64 \
+		--platform linux/amd64,linux/arm/v6,linux/arm64 \
 		--output "type=image,push=true" \
 		--tag inlets/inlets-operator:$(TAG) .
 
diff --git a/hack/install-docker.sh b/hack/install-docker.sh
new file mode 100755
index 00000000..3ff51502
--- /dev/null
+++ b/hack/install-docker.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Source: https://www.docker.com/blog/multi-arch-build-what-about-travis/
+
+sudo rm -rf /var/lib/apt/lists/*
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) edge"
+sudo apt-get update -qy
+sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+mkdir -vp ~/.docker/cli-plugins/
+curl --silent -L "https://github.com/docker/buildx/releases/download/v0.3.0/buildx-v0.3.0.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+chmod a+x ~/.docker/cli-plugins/docker-buildx
+sudo systemctl start docker
+