Move to a single Dockerfile

Author: lucacome

.dockerignore

@@ -0,0 +1 @@
+build_output

.gitignore

@@ -1,2 +1,3 @@
 /build_output
 .DS_Store
+nginx-asg-sync

Makefile

@@ -1,45 +1,34 @@
 GO_DOCKER_RUN = docker run --rm -v $(shell pwd):/go/src/github.com/nginxinc/nginx-asg-sync -v $(shell pwd)/build_output:/build_output -w /go/src/github.com/nginxinc/nginx-asg-sync/cmd/sync
-GOLANG_CONTAINER = golang:1.15
-BUILD_IN_CONTAINER = 1
 GOFLAGS ?= -mod=vendor
 
+export DOCKER_BUILDKIT = 1
+
 all: amazon centos7 ubuntu-xenial amazon2 ubuntu-bionic
 
 test:
-ifeq ($(BUILD_IN_CONTAINER),1)
-	$(GO_DOCKER_RUN) $(GOLANG_CONTAINER) go test
-else
 	GO111MODULE=on GOFLAGS='$(GOFLAGS)' go test ./...
-endif
 
 lint:
 	golangci-lint run
 
-compile: test
-ifeq ($(BUILD_IN_CONTAINER),1)
-	$(GO_DOCKER_RUN) $(GOLANG_CONTAINER) go build -o /build_output/nginx-asg-sync
-else
-	GO111MODULE=on GOFLAGS='$(GOFLAGS)' go build -o ./build_output/nginx-asg-sync github.com/nginxinc/nginx-asg-sync/cmd/sync
-endif
-
-amazon: compile
-	make -C build/package/builders/amazon/
+amazon:
+	docker build -t amazon-builder --target rpm_based --build-arg CONTAINER_VERSION=amazonlinux:1 -f build/Dockerfile .
 	docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output amazon-builder
 
-amazon2: compile
-	make -C build/package/builders/amazon2/
+amazon2:
+	docker build -t amazon2-builder --target rpm_based --build-arg CONTAINER_VERSION=amazonlinux:2 -f build/Dockerfile .
 	docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output amazon2-builder
 
-centos7: compile
-	make -C build/package/builders/centos7/
+centos7:
+	docker build -t centos7-builder --target rpm_based --build-arg CONTAINER_VERSION=centos:7 -f build/Dockerfile .
 	docker run --rm -v $(shell pwd)/build/package/rpm:/rpm -v $(shell pwd)/build_output:/build_output centos7-builder
 
-ubuntu-xenial: compile
-	make -C build/package/builders/ubuntu-xenial/
+ubuntu-xenial:
+	docker build -t ubuntu-xenial-builder --target deb_based --build-arg CONTAINER_VERSION=ubuntu:xenial --build-arg OS_VERSION=xenial -f build/Dockerfile .
 	docker run --rm -v $(shell pwd)/build/package/debian:/debian -v $(shell pwd)/build_output:/build_output ubuntu-xenial-builder
 
-ubuntu-bionic: compile
-	make -C build/package/builders/ubuntu-bionic/
+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
 
 clean:

README.md

@@ -150,7 +150,7 @@ nginx-asg-sync runs as a system service and supports the start/stop/restart comm
 
 For Amazon Linux 1, run: `$ sudo start|stop|restart nginx-asg-sync`
 
-For Ubuntu 16.04 and 18.04, CentOS7/RHEL7 and Amazon Linux 2, run: `$ sudo service nginx-asg-sync start|stop|restart`
+For Ubuntu 16.04, 18.04, 20.04, CentOS7/RHEL7 and Amazon Linux 2, run: `$ sudo service nginx-asg-sync start|stop|restart`
 
 ## Troubleshooting
 
@@ -169,6 +169,7 @@ where `<os>` is the target OS. The following values are allowed:
 * `centos7` for CentOS7/RHEL7
 * `ubuntu-xenial` for Ubuntu 16.04
 * `ubuntu-bionic` for Ubuntu 18.04
+* `ubuntu-focal` for Ubuntu 20.04
 
 If you run make without any arguments, it will build software packages for all supported OSes.
 

build/Dockerfile

@@ -0,0 +1,35 @@
+ARG CONTAINER_VERSION
+ARG GOLANG_CONTAINER=golang:1.15
+
+FROM $GOLANG_CONTAINER AS builder
+WORKDIR /go/src/github.com/nginxinc/nginx-asg-sync/cmd/sync
+COPY . /go/src/github.com/nginxinc/nginx-asg-sync/
+
+RUN go build -o /nginx-asg-sync
+
+#---------------------------------------------------------------------------------------------
+
+FROM ${CONTAINER_VERSION} as rpm_based
+
+RUN yum install -y rpmdevtools
+ADD build/package/builders/rpm_based/build.sh /
+
+COPY --from=builder /nginx-asg-sync /nginx-asg-sync
+
+ENTRYPOINT ["/build.sh"]
+
+#---------------------------------------------------------------------------------------------
+
+FROM ${CONTAINER_VERSION} as deb_based
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install debhelper dh-systemd -y
+ADD build/package/builders/deb_based/build.sh /
+
+COPY --from=builder /nginx-asg-sync /nginx-asg-sync
+
+ARG PACKAGE_VERSION
+ARG OS_VERSION
+ENV PACKAGE_VERSION=${PACKAGE_VERSION}
+ENV OS_VERSION=${OS_VERSION}
+
+ENTRYPOINT ["/build.sh"]