Merge commit '536f0c84ae2c5272a8e1d9bb83839766d34f6d14'

.gitlab/Makefile

@@ -4,24 +4,6 @@ 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 make/docker.makefile
+include make/kaniko.makefile
+include make/truenas.makefile

.gitlab/make/docker.makefile

@@ -0,0 +1,26 @@
+.PHONY: docker-init
+docker-init:
+	@touch VERSION
+	@touch IMAGE
+
+.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