services/charts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit '9095d7d0b0b2be73012a0714bf0b65b1e6adc50e'

Browse Source
This commit is contained in:
ducoterra
2021-11-01 10:07:09 -04:00
parent 1abb62322c b07a2c095b
commit 446da1ff0e
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -3,14 +3,33 @@ SHELL := /bin/bash
IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION) 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)
STASH ?= "common-update-stash"
include .gitlab/make/docker.makefile include .gitlab/make/docker.makefile
include .gitlab/make/helm.makefile include .gitlab/make/helm.makefile
include .gitlab/make/kaniko.makefile include .gitlab/make/kaniko.makefile
include .gitlab/make/truenas.makefile include .gitlab/make/truenas.makefile
.PHONY: warning
warning:
@printf "Running a potentially destructive command. If a conflict occurs, fix the conflict and re-run the command.\n"
@printf "Cancel with ctrl + c within 3 seconds."
@sleep 3
.PHONY: make-stash-drop
make-stash-drop:
@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash drop; fi
.PHONY: make-update .PHONY: make-update
make-update: make-update:
@git stash @git stash save $(STASH)
@git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash -git subtree pull --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash
@git stash pop @if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash pop; fi
.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