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: ba12c923ba
This commit is contained in:
ducoterra
2021-10-31 21:04:21 -04:00
parent 8a52a21a39
commit 3d29d92f8a
5 changed files with 21 additions and 7 deletions

View File

@@ -4,6 +4,7 @@ IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION)
IMAGE_LATEST ?= $(shell cat IMAGE):latest IMAGE_LATEST ?= $(shell cat IMAGE):latest
PWD ?= $(shell pwd) PWD ?= $(shell pwd)
include make/docker.makefile include .gitlab/make/docker.makefile
include make/kaniko.makefile include .gitlab/make/helm.makefile
include make/truenas.makefile include .gitlab/make/kaniko.makefile
include .gitlab/make/truenas.makefile

10
README.md Normal file
View File

@@ -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
```

View File

@@ -20,7 +20,3 @@ build:
push: push:
docker buildx build --platform linux/amd64 --push . -t $(IMAGE) docker buildx build --platform linux/amd64 --push . -t $(IMAGE)
@docker buildx build --platform linux/amd64 --push . -t $(IMAGE_LATEST) @docker buildx build --platform linux/amd64 --push . -t $(IMAGE_LATEST)
.PHONY: run
run:
docker run -it -v $(PWD):/mc_data $(IMAGE) bash

4
make/helm.makefile Normal file
View File

@@ -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

View File

@@ -0,0 +1,3 @@
.PHONY: chart-release
chart-release:
@rsync -av $(CHART)/helm/ charts/$(CHART)/$(shell cat $(CHART)/VERSION)/