From c7c547c80ff6f1142650a8f74e6e80720e35e674 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sat, 30 Oct 2021 22:46:34 -0400 Subject: [PATCH] Switch to common Makefile Rather than writing our own Makefile use the common one. --- Makefile | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 0792771..c114817 100644 --- a/Makefile +++ b/Makefile @@ -1,27 +1 @@ -SHELL := /bin/bash - -IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION) -IMAGE_LATEST ?= $(shell cat IMAGE):latest -PWD ?= $(shell pwd) - -.PHONY: buildx-context -buildx-context: - docker buildx create --name arm64 --use --platform linux/amd64,linux/arm64 - -.PHONY: buildx-clear -buildx-clear: - docker buildx rm arm64 - -.PHONY: build -build: - docker buildx build --load . -t $(IMAGE) - @docker buildx build --load . -t $(IMAGE_LATEST) - -.PHONY: push -push: - docker buildx build --platform linux/amd64 --push . -t $(IMAGE) - @docker buildx build --platform linux/amd64 --push . -t $(IMAGE_LATEST) - -.PHONY: run -run: - docker run -it -v $(PWD):/mc_data $(IMAGE) bash +include .common/Makefile