From 3d29d92f8aee30354fb3d468285de4b6641e2a17 Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Sun, 31 Oct 2021 21:04:21 -0400
Subject: [PATCH] Squashed '.gitlab/' changes from 8a52a21..ba12c92

ba12c92 Remove docker-run
74a4a4e Transition to .gitlab prefix
3e8ca71 Add chart-release to truenas.makefile
4146777 Add helm.makefile

git-subtree-dir: .gitlab
git-subtree-split: ba12c923ba6644e8aadcc18b33feaacf61a8fb43
---
 Makefile              |  7 ++++---
 README.md             | 10 ++++++++++
 make/docker.makefile  |  4 ----
 make/helm.makefile    |  4 ++++
 make/truenas.makefile |  3 +++
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 README.md
 create mode 100644 make/helm.makefile

diff --git a/Makefile b/Makefile
index 4bcb9cd..1575e0d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION)
 IMAGE_LATEST ?= $(shell cat IMAGE):latest
 PWD ?= $(shell pwd)
 
-include make/docker.makefile
-include make/kaniko.makefile
-include make/truenas.makefile
+include .gitlab/make/docker.makefile
+include .gitlab/make/helm.makefile
+include .gitlab/make/kaniko.makefile
+include .gitlab/make/truenas.makefile
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1d084b1
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+# Adding the "common" subtree as your .gitlab folder
+
+```bash
+# Add the subtree as a remote
+git remote add common git@gitlab.ducoterra.net:services/common.git
+git subtree add --prefix .gitlab common main
+
+# Now you can run the following to update
+git subtree pull --prefix .gitlab common main
+```
diff --git a/make/docker.makefile b/make/docker.makefile
index 4af850f..fc07142 100644
--- a/make/docker.makefile
+++ b/make/docker.makefile
@@ -20,7 +20,3 @@ build:
 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
diff --git a/make/helm.makefile b/make/helm.makefile
new file mode 100644
index 0000000..f603af4
--- /dev/null
+++ b/make/helm.makefile
@@ -0,0 +1,4 @@
+.PHONY: helm-release
+helm-release:
+	@yq e ".version = \"$(shell cat VERSION)\"" -i helm/Chart.yaml	
+	@yq e ".appVersion = \"$(shell cat VERSION)\"" -i helm/Chart.yaml
diff --git a/make/truenas.makefile b/make/truenas.makefile
index e69de29..c6fb58c 100644
--- a/make/truenas.makefile
+++ b/make/truenas.makefile
@@ -0,0 +1,3 @@
+.PHONY: chart-release
+chart-release:
+	@rsync -av $(CHART)/helm/ charts/$(CHART)/$(shell cat $(CHART)/VERSION)/