a13cfe64d0
16ee2f3 Merge branch 'various-docker-fixes' into 'main' 5b3e196 fix docker build and remove release 4bf9d45 Merge branch 'prefix-docker-commands' into 'main' 91b77b3 don't reset head after subtree pull, it breaks things 66b4362 prefix all docker commands with docker- ba2827a Merge branch 'allow-specify-branch' into 'main' 4de5558 ignore .gitlab 71ff227 Allow pulling specific branch with BRANCH_NAME git-subtree-dir: .gitlab git-subtree-split: 16ee2f3ddcc1235cb4a6b7a38c82d52859e8408f
22 lines
838 B
Makefile
22 lines
838 B
Makefile
SHELL := /bin/bash
|
|
|
|
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"
|
|
MAKE_BRANCH ?= main
|
|
|
|
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
|
|
include .gitlab/make/kubectl.makefile
|
|
|
|
# git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
|
|
.PHONY: make-update
|
|
make-update:
|
|
@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH)
|