Merge remote-tracking branch 'puppetlabs/6.4.x'

* puppetlabs/6.4.x:
  (maint) Update puppet to e698e682261ba3c15cd80f0fc30749a575d13c6a
  (maint) Update pxp-agent to e3e910cc6dc30bb89625c89accdfcb7d052b2e0e
  (maint) Update puppet-runtime to 201909120
  (maint) Update puppet-runtime to 201909120
  (maint) Update pxp-agent to d0b10a5efe32ed4df98e8aac5d6dca107e28e3b6
  (maint) Update puppet to da8de973bac4ea1aa160f50c87b97f5b8c0e95bc
  (maint) add pupperware as codeowner of 'docker' directory
  (maint) Add `LATEST_VERSION` parameter for more configurability
  (maint) Clean up nightly container build remnants

# Conflicts:
#	CODEOWNERS
#	configs/components/puppet.json
#	configs/components/pxp-agent.json
#	docker/Makefile

docker/Makefile

@@ -12,6 +12,9 @@ export GEMFILE = $(pwd)/Gemfile
 
 version = $(shell echo $(git_describe) | sed 's/-.*//')
 dockerfile := Dockerfile
+makefile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
+makefile_dir := $(dir $(makefile_path))
+LATEST_VERSION ?= latest
 
 prep:
 	@git fetch --unshallow ||:
@@ -32,9 +35,9 @@ build: prep
 	@docker tag $(NAMESPACE)/puppet-agent-ubuntu:$(version) $(NAMESPACE)/puppet-agent:$(version)
 	@docker build --pull --build-arg vcs_ref=$(vcs_ref) --build-arg build_date=$(build_date) --build-arg version=$(version) --file puppet-agent-alpine/$(dockerfile) --tag $(NAMESPACE)/puppet-agent-alpine:$(version) $(pwd)/..
 ifeq ($(IS_LATEST),true)
-	@docker tag $(NAMESPACE)/puppet-agent-ubuntu:$(version) $(NAMESPACE)/puppet-agent-ubuntu:latest
-	@docker tag $(NAMESPACE)/puppet-agent-ubuntu:$(version) $(NAMESPACE)/puppet-agent:latest
-	@docker tag $(NAMESPACE)/puppet-agent-alpine:$(version) $(NAMESPACE)/puppet-agent-alpine:latest
+	@docker tag $(NAMESPACE)/puppet-agent-ubuntu:$(version) $(NAMESPACE)/puppet-agent-ubuntu:$(LATEST_VERSION)
+	@docker tag $(NAMESPACE)/puppet-agent-ubuntu:$(version) $(NAMESPACE)/puppet-agent:$(LATEST_VERSION)
+	@docker tag $(NAMESPACE)/puppet-agent-alpine:$(version) $(NAMESPACE)/puppet-agent-alpine:$(LATEST_VERSION)
 endif
 
 test: prep
@@ -49,9 +52,9 @@ publish: prep
 	@docker push $(NAMESPACE)/puppet-agent:$(version)
 	@docker push $(NAMESPACE)/puppet-agent-alpine:$(version)
 ifeq ($(IS_LATEST),true)
-	@docker push $(NAMESPACE)/puppet-agent-ubuntu:latest
-	@docker push $(NAMESPACE)/puppet-agent:latest
-	@docker push $(NAMESPACE)/puppet-agent-alpine:latest
+	@docker push $(NAMESPACE)/puppet-agent-ubuntu:$(LATEST_VERSION)
+	@docker push $(NAMESPACE)/puppet-agent:$(LATEST_VERSION)
+	@docker push $(NAMESPACE)/puppet-agent-alpine:$(LATEST_VERSION)
 endif
 
 .PHONY: lint build test publish