From 66b436219fc50e73c0b0105146c30e83626becfb Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 12 Dec 2021 18:55:13 -0500 Subject: [PATCH] prefix all docker commands with docker- --- make/docker.makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/make/docker.makefile b/make/docker.makefile index 23e4a52..f07cfcf 100644 --- a/make/docker.makefile +++ b/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