(maint) Collapse puppetserver-base Docker directory

 - Now that the file to create puppetserver-base is called
   base.Dockerfile, there are no real collisions to avoid.

 - This is the next step towards consolidating to a single Dockerfile
   with multiple build targets

azure-pipelines.yml

@@ -49,7 +49,7 @@ steps:
 
 - powershell: |
     . "$(bundle show pupperware)/ci/build.ps1"
-    Lint-Dockerfile -Name $ENV:CONTAINER_NAME_BASE -Path "docker/${ENV:CONTAINER_NAME_BASE}/base.Dockerfile" -Ignore ($ENV:LINT_IGNORES -split ' ')
+    Lint-Dockerfile -Name $ENV:CONTAINER_NAME_BASE -Path "docker/puppetserver/base.Dockerfile" -Ignore ($ENV:LINT_IGNORES -split ' ')
   displayName: Lint $(CONTAINER_NAME_BASE) Dockerfile
   timeoutInMinutes: 1
   name: lint_base_dockerfile
@@ -63,7 +63,7 @@ steps:
 
 - powershell: |
     . "$(bundle show pupperware)/ci/build.ps1"
-    Build-Container -Name $ENV:CONTAINER_NAME_BASE -Dockerfile "docker/${ENV:CONTAINER_NAME_BASE}/base.Dockerfile"  -Namespace $ENV:NAMESPACE -AdditionalOptions ($ENV:BUILD_OPTIONS -split ' ')
+    Build-Container -Name $ENV:CONTAINER_NAME_BASE -Dockerfile "docker/puppetserver/base.Dockerfile"  -Namespace $ENV:NAMESPACE -AdditionalOptions ($ENV:BUILD_OPTIONS -split ' ')
   displayName: Build $(CONTAINER_NAME_BASE) Container
   timeoutInMinutes: 5
   name: build_base_container

docker/Makefile

@@ -29,13 +29,13 @@ prep:
 
 lint:
 ifeq ($(hadolint_available),0)
-	@$(hadolint_command) puppetserver-base/base.Dockerfile
+	@$(hadolint_command) puppetserver/base.Dockerfile
 	@$(hadolint_command) puppetserver/$(dockerfile)
 else
 	@docker pull $(hadolint_container)
 	@docker run --rm -v $(PWD)/puppetserver/$(dockerfile):/Dockerfile \
 		-i $(hadolint_container) $(hadolint_command) Dockerfile
-	@docker run --rm -v $(PWD)/puppetserver-base/base.Dockerfile:/Dockerfile \
+	@docker run --rm -v $(PWD)/puppetserver/base.Dockerfile:/Dockerfile \
 		-i $(hadolint_container) $(hadolint_command) Dockerfile
 endif
 
@@ -46,8 +46,8 @@ build: prep
 		--build-arg build_date=$(build_date) \
 		--build-arg version=$(VERSION) \
 		--build-arg pupperware_analytics_stream=$(PUPPERWARE_ANALYTICS_STREAM) \
-		--file puppetserver-base/base.Dockerfile \
-		--tag $(NAMESPACE)/puppetserver-base:$(VERSION) puppetserver-base \
+		--file puppetserver/base.Dockerfile \
+		--tag $(NAMESPACE)/puppetserver-base:$(VERSION) puppetserver \
 		${DOCKER_BUILD_FLAGS}
 	docker build \
 		--build-arg namespace=$(NAMESPACE) \