From 74a4a4e77f5fa40b486ae9b94a91e53b3ace5d65 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 31 Oct 2021 20:33:47 -0400 Subject: [PATCH] Transition to .gitlab prefix Expect repo to be subtree'd as ".gitlab" --- Makefile | 7 ++++--- README.md | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 README.md 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 +```