Merge branch 'prefix-docker-commands' into 'main'

prefix all docker commands with docker-

See merge request services/common!7

Makefile

@@ -16,8 +16,6 @@ include .gitlab/make/git.makefile
 include .gitlab/make/kubectl.makefile
 
 # git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
-# git reset head~1
 .PHONY: make-update
 make-update:
 	@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH)
-	@git reset head~1

make/docker.makefile

@@ -3,27 +3,27 @@ docker-init:
 	@touch VERSION
 	@touch IMAGE
 
-.PHONY: buildx-context
-buildx-context:
+.PHONY: docker-buildx-context
+docker-buildx-context:
 	docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
 
-.PHONY: buildx-clear
-buildx-clear:
+.PHONY: docker-buildx-clear
+docker-buildx-clear:
 	docker buildx rm container-builder
 
-.PHONY: build
-build:
+.PHONY: docker-build
+docker-build:
 	docker buildx build --load . -t $(IMAGE)
 	@docker buildx build --load . -t $(IMAGE_LATEST)
 
-.PHONY: push
-push:
-	-make buildx-clear
-	@make buildx-context
+.PHONY: docker-push
+docker-push:
+	-make docker-buildx-clear
+	@make docker-buildx-context
 	docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE)
 	@docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE_LATEST)
 
 .PHONY: docker-release
 docker-release:
 	@yq e ".services.minecraft.image = \"$(IMAGE)\"" -i docker-compose.yaml
-	@make push
+	@make docker-push