Squashed '.gitlab/' changes from 9eed509..731ada6

731ada6 Merge branch 'make-update-fixes' into 'main'
c3e6d73 Switch to "subtree split" push strategy
3c91292 Make user stash their own damn changes
d86b505 Add PROJECT_NAME and VERSION
9d0c9c6 Update README with "common" remote
30fb8c2 Merge branch 'docker-buidlx-overhaul' into 'main'
fd96b3f Merge branch 'git-release' into 'main'
a6053ed Add make git-release
3563c5c Add make docker-release
40a217b Use buildx to create multi-arch images
5e2bc5f Switch to container-builder buildx platform

git-subtree-dir: .gitlab
git-subtree-split: 731ada6a3d

Makefile

@@ -1,6 +1,8 @@
 SHELL := /bin/bash
 
-IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION)
+PROJECT_NAME ?= $(shell git config --local remote.origin.url|sed -n 's#.*/\([^.]*\)\.git#\1#p')
+VERSION ?= $(shell cat VERSION)
+IMAGE ?= $(shell cat IMAGE):$(VERSION)
 IMAGE_LATEST ?= $(shell cat IMAGE):latest
 PWD ?= $(shell pwd)
 STASH ?= "common-update-stash"
@@ -9,6 +11,7 @@ include .gitlab/make/docker.makefile
 include .gitlab/make/helm.makefile
 include .gitlab/make/kaniko.makefile
 include .gitlab/make/truenas.makefile
+include .gitlab/make/git.makefile
 
 .PHONY: warning
 warning:
@@ -22,14 +25,10 @@ make-stash-drop:
 
 .PHONY: make-update
 make-update:
-	@git stash save $(STASH)
-	-git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main
-	@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
+	@git subtree pull --prefix .gitlab --message "Merge update from Common" -q common main
 
 .PHONY: make-push
 make-push: warning
 	@make make-update
-	@git remote add common git@gitlab.ducoterra.net:services/common.git
-	@git subtree push --prefix .gitlab common main
-	@git remote remove common
-	@make make-update
+	@git subtree split --branch common/$(PROJECT_NAME) --prefix .gitlab
+	@git push common common/$(PROJECT_NAME):common/$(PROJECT_NAME)