Add Ubuntu 20.04 and 20.10

Makefile

@@ -3,8 +3,9 @@ GOFLAGS ?= -mod=vendor
 
 export DOCKER_BUILDKIT = 1
 
-all: amazon centos7 ubuntu-xenial amazon2 ubuntu-bionic
+all: amazon centos7 ubuntu-xenial amazon2 ubuntu-bionic ubuntu-focal ubuntu-groovy
 
+.PHONY: test
 test:
 	GO111MODULE=on GOFLAGS='$(GOFLAGS)' go test ./...
 
@@ -31,7 +32,22 @@ ubuntu-bionic:
 	docker build -t ubuntu-bionic-builder --target deb_based --build-arg CONTAINER_VERSION=ubuntu:bionic --build-arg OS_VERSION=bionic -f build/Dockerfile .
 	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-bionic-builder
 
+ubuntu-focal:
+	docker build -t ubuntu-focal-builder --target deb_based --build-arg CONTAINER_VERSION=ubuntu:focal --build-arg OS_VERSION=focal -f build/Dockerfile .
+	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-focal-builder
+
+ubuntu-groovy:
+	docker build -t ubuntu-groovy-builder --target deb_based --build-arg CONTAINER_VERSION=ubuntu:groovy --build-arg OS_VERSION=groovy -f build/Dockerfile .
+	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-groovy-builder
+
+.PHONY: clean
 clean:
 	-rm -r build_output
 
-.PHONY: test
+.PHONY: deps
+deps:
+	@go mod tidy && go mod verify && go mod vendor
+
+.PHONY: clean-cache
+clean-cache:
+	@go clean -modcache

README.md

@@ -170,6 +170,7 @@ where `<os>` is the target OS. The following values are allowed:
 * `ubuntu-xenial` for Ubuntu 16.04
 * `ubuntu-bionic` for Ubuntu 18.04
 * `ubuntu-focal` for Ubuntu 20.04
+* `ubuntu-groovy` for Ubuntu 20.10
 
 If you run make without any arguments, it will build software packages for all supported OSes.
 

build/Dockerfile

@@ -1,4 +1,4 @@
-ARG CONTAINER_VERSION
+ARG CONTAINER_VERSION=ubuntu:groovy
 ARG GOLANG_CONTAINER=golang:1.15
 
 FROM $GOLANG_CONTAINER AS builder