fix: drone, docker-compose, Dockerfile and Makefile

Makefile

@@ -3,60 +3,42 @@
 # container runtime. This is needed to start and run a container image.
 CONTAINER_RUNTIME?=$(shell which docker)
 
-# BASE_IMAGE
-# Defines the name of the container base image on which should be built the new
-# CONTAINER_IMAGE.
-BASE_IMAGE_REGISTRY_NAME:=docker.io
-BASE_IMAGE_NAMESPACE:=library
-BASE_IMAGE_NAME:=alpine
-BASE_IMAGE_VERSION:=3.11.2
-BASE_IMAGE_FULL=${BASE_IMAGE_REGISTRY_NAME}/${BASE_IMAGE_NAMESPACE}/${BASE_IMAGE_NAME}:${BASE_IMAGE_VERSION}
-BASE_IMAGE_SHORT=${BASE_IMAGE_NAMESPACE}/${BASE_IMAGE_NAME}:${BASE_IMAGE_VERSION}
-
-# CONTAINER_IMAGE_REGISTRY_NAME
+# NETWORKTOOLS_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.
-CONTAINER_IMAGE_REGISTRY_NAME:=docker.io
-CONTAINER_IMAGE_REGISTRY_USER:=volkerraschek
+NETWORKTOOLS_IMAGE_REGISTRY_NAME:=docker.io
+NETWORKTOOLS_IMAGE_REGISTRY_USER:=volkerraschek
 
-CONTAINER_IMAGE_NAMESPACE?=${CONTAINER_IMAGE_REGISTRY_USER}
-CONTAINER_IMAGE_NAME:=network-tools
-CONTAINER_IMAGE_VERSION?=latest
-CONTAINER_IMAGE_FULL=${CONTAINER_IMAGE_REGISTRY_NAME}/${CONTAINER_IMAGE_NAMESPACE}/${CONTAINER_IMAGE_NAME}:${CONTAINER_IMAGE_VERSION}
-CONTAINER_IMAGE_SHORT=${CONTAINER_IMAGE_NAMESPACE}/${CONTAINER_IMAGE_NAME}:${CONTAINER_IMAGE_VERSION}
+NETWORKTOOLS_IMAGE_NAMESPACE?=${NETWORKTOOLS_IMAGE_REGISTRY_USER}
+NETWORKTOOLS_IMAGE_NAME:=network-tools
+NETWORKTOOLS_IMAGE_VERSION?=latest
+NETWORKTOOLS_IMAGE_FULLY_QUALIFIED=${NETWORKTOOLS_IMAGE_REGISTRY_NAME}/${NETWORKTOOLS_IMAGE_NAMESPACE}/${NETWORKTOOLS_IMAGE_NAME}:${NETWORKTOOLS_IMAGE_VERSION}
+NETWORKTOOLS_IMAGE_UNQUALIFIED=${NETWORKTOOLS_IMAGE_NAMESPACE}/${NETWORKTOOLS_IMAGE_NAME}:${NETWORKTOOLS_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/build
 container-image/build:
 	${CONTAINER_RUNTIME} build \
-		--build-arg BASE_IMAGE=${BASE_IMAGE_FULL} \
 		--file Dockerfile \
 		--no-cache \
 		--pull \
-		--tag ${CONTAINER_IMAGE_FULL} \
-		--tag ${CONTAINER_IMAGE_SHORT} \
+		--tag ${NETWORKTOOLS_IMAGE_FULLY_QUALIFIED} \
+		--tag ${NETWORKTOOLS_IMAGE_UNQUALIFIED} \
 		.
 
 # DELETE CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/delete
 container-image/delete:
-	- ${CONTAINER_RUNTIME} image rm ${CONTAINER_IMAGE_FULL} ${CONTAINER_IMAGE_SHORT}
+	- ${CONTAINER_RUNTIME} image rm ${NETWORKTOOLS_IMAGE_FULLY_QUALIFIED} ${NETWORKTOOLS_IMAGE_UNQUALIFIED}
 	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
 
 # PUSH CONTAINER IMAGE
 # ==============================================================================
 PHONY+=container-image/push
 container-image/push:
-	echo ${CONTAINER_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${CONTAINER_IMAGE_REGISTRY_NAME} --username ${CONTAINER_IMAGE_REGISTRY_USER} --password-stdin
-	${CONTAINER_RUNTIME} push ${CONTAINER_IMAGE_FULL}
-
-# PUSH README
-# ==============================================================================
-PHONY+=push/README
-push/README:
-	echo ${CONTAINER_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${CONTAINER_IMAGE_REGISTRY_NAME} --username ${CONTAINER_IMAGE_REGISTRY_USER} --password-stdin
-	docker pushrm ${CONTAINER_IMAGE_FULL}
+	echo ${NETWORKTOOLS_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${NETWORKTOOLS_IMAGE_REGISTRY_NAME} --username ${NETWORKTOOLS_IMAGE_REGISTRY_USER} --password-stdin
+	${CONTAINER_RUNTIME} push ${NETWORKTOOLS_IMAGE_FULLY_QUALIFIED}
 
 # PHONY
 # ==============================================================================