From fda8323c19f23998eefcaa453a2fdbbe7af7e2b4 Mon Sep 17 00:00:00 2001 From: ducoterra Date: Sun, 31 Oct 2021 22:52:46 -0400 Subject: [PATCH] switch to no remote --- .gitlab/Makefile | 10 ---------- .gitlab/README.md | 10 ---------- .gitlab/make/docker.makefile | 26 -------------------------- .gitlab/make/helm.makefile | 4 ---- .gitlab/make/kaniko.makefile | 0 .gitlab/make/truenas.makefile | 3 --- 6 files changed, 53 deletions(-) delete mode 100644 .gitlab/Makefile delete mode 100644 .gitlab/README.md delete mode 100644 .gitlab/make/docker.makefile delete mode 100644 .gitlab/make/helm.makefile delete mode 100644 .gitlab/make/kaniko.makefile delete mode 100644 .gitlab/make/truenas.makefile diff --git a/.gitlab/Makefile b/.gitlab/Makefile deleted file mode 100644 index 1575e0d..0000000 --- a/.gitlab/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -SHELL := /bin/bash - -IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION) -IMAGE_LATEST ?= $(shell cat IMAGE):latest -PWD ?= $(shell pwd) - -include .gitlab/make/docker.makefile -include .gitlab/make/helm.makefile -include .gitlab/make/kaniko.makefile -include .gitlab/make/truenas.makefile diff --git a/.gitlab/README.md b/.gitlab/README.md deleted file mode 100644 index 1d084b1..0000000 --- a/.gitlab/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# 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/.gitlab/make/docker.makefile b/.gitlab/make/docker.makefile deleted file mode 100644 index 4af850f..0000000 --- a/.gitlab/make/docker.makefile +++ /dev/null @@ -1,26 +0,0 @@ -.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 diff --git a/.gitlab/make/helm.makefile b/.gitlab/make/helm.makefile deleted file mode 100644 index f603af4..0000000 --- a/.gitlab/make/helm.makefile +++ /dev/null @@ -1,4 +0,0 @@ -.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/.gitlab/make/kaniko.makefile b/.gitlab/make/kaniko.makefile deleted file mode 100644 index e69de29..0000000 diff --git a/.gitlab/make/truenas.makefile b/.gitlab/make/truenas.makefile deleted file mode 100644 index c6fb58c..0000000 --- a/.gitlab/make/truenas.makefile +++ /dev/null @@ -1,3 +0,0 @@ -.PHONY: chart-release -chart-release: - @rsync -av $(CHART)/helm/ charts/$(CHART)/$(shell cat $(CHART)/VERSION)/