From e48db9ec27c429325202988c7945890af557cdd8 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sun, 13 Sep 2020 00:13:47 +0300
Subject: Travis: switch to Focal

---
 Makefile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5e1d538..9fa7ccd 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,11 @@ PROJECT := cgit-repos
 # Enable buildx support:
 export DOCKER_CLI_EXPERIMENTAL := enabled
 # Target platforms (used by buildx):
-platforms := linux/amd64,linux/armhf
+PLATFORMS := linux/amd64,linux/armhf
 # Docker Hub credentials:
 DOCKER_USERNAME := egortensin
+# In case buildx isn't installed (e.g. on Ubuntu):
+BUILDX_VERSION := v0.4.2
 
 .PHONY: all
 all: build
@@ -70,6 +72,12 @@ docker/push: check-push docker/build
 fix-binfmt:
 	docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
 
+.PHONY: buildx/install
+buildx/install:
+	mkdir -p -- ~/.docker/cli-plugins/
+	curl --silent --show-error --location -- 'https://github.com/docker/buildx/releases/download/$(BUILDX_VERSION)/buildx-$(BUILDX_VERSION).linux-amd64' > ~/.docker/cli-plugins/docker-buildx
+	chmod +x -- ~/.docker/cli-plugins/docker-buildx
+
 .PHONY: buildx/create
 buildx/create: fix-binfmt
 	docker buildx create --use --name "$(PROJECT)_builder"
@@ -80,8 +88,8 @@ buildx/rm:
 
 .PHONY: buildx/build
 buildx/build:
-	docker buildx build -t "$(DOCKER_USERNAME)/$(PROJECT)" --platform "$(platforms)" --progress plain .
+	docker buildx build -t "$(DOCKER_USERNAME)/$(PROJECT)" --platform "$(PLATFORMS)" --progress plain .
 
 .PHONY: buildx/push
 buildx/push:
-	docker buildx build -t "$(DOCKER_USERNAME)/$(PROJECT)" --platform "$(platforms)" --progress plain --push .
+	docker buildx build -t "$(DOCKER_USERNAME)/$(PROJECT)" --platform "$(PLATFORMS)" --progress plain --push .
-- 
cgit v1.2.3