Revert "feat(makefile): add docker buildx support (CrunchyData#72)"

This reverts commit 431ff9d.

Unfortunately the PR broke builds for RHEL7 which is an important
platform for us. If buildx support can be brought in without
issues, we're open to a new PR. cc/ @awill1988 @crunchyheath

Author: pramsey

.cnf.makefile

@@ -1,22 +1,11 @@
-# Lightweight Alpine-based pg_tileserv Docker Image
-# Author: Just van den Broecke
-FROM golang:1.15.5
-
-# Build ARGS
-ARG VERSION
-
-RUN mkdir /app
-ADD . /app/
-WORKDIR /app
-RUN go build -v -ldflags "-s -w -X main.programVersion=${VERSION}" \
-    && chmod +x ./pg_tileserv
-
 # copy build result to a centos base image to match other
 # crunchy containers
 FROM centos:7
 RUN mkdir /app
-COPY --from=0 /app/assets /app/assets
-COPY --from=0 /app/pg_tileserv /app/pg_tileserv
+ADD ./pg_tileserv /app/
+ADD ./assets /app/assets
+
+ARG VERSION
 
 LABEL vendor="Crunchy Data" \
 	url="https://crunchydata.com" \

Dockerfile

@@ -1,48 +1,46 @@
-include .cnf.makefile
 
+APPVERSION := latest
 GOVERSION := 1.15
 PROGRAM := pg_tileserv
 CONFIG := config/$(PROGRAM).toml
+CONTAINER := pramsey/$(PROGRAM)
 
 RM = /bin/rm
 CP = /bin/cp
 MKDIR = /bin/mkdir
 
-.PHONY: bin-docker build-docker buildx-docker build check clean docs install install-buildx release test uninstall
+.PHONY: bin-docker build-docker build check clean docs install release test uninstall
 
 .DEFAULT_GOAL := help
 
 GOFILES := $(wildcard *.go)
 
 all: $(PROGRAM)
 
-check:  ##          This checks the current version of Go installed locally
+check:  ##         This checks the current version of Go installed locally
 	@go version
 
-clean:  ##          This will clean all local build artifacts
+clean:  ##         This will clean all local build artifacts
 	$(info Cleaning project...)
 	@rm -f $(PROGRAM)
 	@rm -rf docs/*
 	docker image prune --force
 
-docs:   ##           Generate docs
+docs:   ##          Generate docs
 	@rm -rf docs/* && cd hugo && hugo && cd ..
 
-build: $(GOFILES)  ##          Build a local binary using APPVERSION parameter or CI as default
+build: $(GOFILES)  ##         Build a local binary using APPVERSION parameter or CI as default
 	go build -v -ldflags "-s -w -X main.programVersion=$(APPVERSION)"
 
-bin-docker:  ##     Build a local binary based off of a golang base docker image
+bin-docker:  ##    Build a local binary based off of a golang base docker image
 	sudo docker run --rm -v "$(PWD)":/usr/src/myapp:z -w /usr/src/myapp golang:$(GOVERSION) make APPVERSION=$(APPVERSION) build
 
-build-docker: $(PROGRAM) Dockerfile  ##   Generate a CentOS 7 container with APPVERSION tag, using binary from current environment
-	docker build -f $(DOCKERFILE) --build-arg VERSION=$(APPVERSION) -t $(REPO)/$(PROGRAM):$(APPVERSION) .
+build-docker: $(PROGRAM) Dockerfile  ##  Generate a CentOS 7 container with APPVERSION tag, using binary from current environment
+	docker build -f Dockerfile --build-arg VERSION=$(APPVERSION) -t $(CONTAINER):$(APPVERSION) .
 
-buildx-docker:	##  Compiles multi-arch images and pushes them to a custom repository
-	docker buildx build -f $(DOCKERFILE) --platform=$(BUILDPLATFORM) --build-arg VERSION=$(APPVERSION) -t $(REPO)/$(PROGRAM):$(APPVERSION) --push .
+release: clean docs build build-docker  ##       Generate the docs, a local build, and then uses the local build to generate a CentOS 7 container
 
-release: clean docs build build-docker  ##        Generate the docs, a local build, and then uses the local build to generate a CentOS 7 container
-
-test:  ##           Run the tests locally
+test:  ##          Run the tests locally
 	go test -v
 
 $(CONFIG): $(CONFIG).example
@@ -57,16 +55,12 @@ install: $(PROGRAM) docs $(CONFIG) ##        This will install the program local
 	$(CP) -r assets $(DESTDIR)/usr/share/$(PROGRAM)/assets
 	$(CP) -r docs $(DESTDIR)/usr/share/$(PROGRAM)/docs
 
-install-buildx:	## This will install the buildx plugin for docker depending on the system
-	wget -nc --quiet https://github.com/docker/buildx/releases/download/v0.4.2/buildx-v0.4.2.$(uname_S)-$(ARCH) -P ~/.docker/cli-plugins -O docker-buildx
-	chmod a+x ~/.docker/cli-plugins/docker-buildx
-
-uninstall:  ##      This will uninstall the program from your local system
+uninstall:  ##     This will uninstall the program from your local system
 	$(RM) $(DESTDIR)/usr/bin/$(PROGRAM)
 	$(RM) $(DESTDIR)/etc/$(PROGRAM).toml
 	$(RM) -r $(DESTDIR)/usr/share/$(PROGRAM)
 
-help:   ##           Prints this help message
+help:   ##          Prints this help message
 	@echo ""
 	@echo ""
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/:.*##/:/'