cleanup Makefile
This commit is contained in:
parent
5f6748f627
commit
e38312df60
1 changed files with 9 additions and 6 deletions
15
Makefile
15
Makefile
|
@ -4,25 +4,28 @@ BROWSER=conkeror
|
||||||
IKIWIKI=ikiwiki
|
IKIWIKI=ikiwiki
|
||||||
|
|
||||||
VERSION=$(shell git describe --always)
|
VERSION=$(shell git describe --always)
|
||||||
ARGOCD_HOME=$(shell echo $HOME/vcs/k8s-config/cluster/p10/apps/templates/)
|
ARGOCD_HOME=$$HOME/vcs/k8s-config/cluster/p10/apps/templates/
|
||||||
ARGOCD_YAML=nicoweb.yaml
|
ARGOCD_YAML=nicoweb.yaml
|
||||||
ARGOCD_APP=$(ARGOCD_HOME)/$(ARGOCD_YAML)
|
ARGOCD_APP=$(ARGOCD_HOME)/$(ARGOCD_YAML)
|
||||||
|
|
||||||
IMAGE_NAME=harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org
|
IMAGE_NAME=harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org
|
||||||
|
|
||||||
all: container
|
all: argocd
|
||||||
|
|
||||||
pub:
|
gitpush:
|
||||||
git push --mirror
|
git push --mirror
|
||||||
setup:
|
|
||||||
$(IKIWIKI) --refresh --setup ikiwiki.setup
|
|
||||||
|
|
||||||
container:
|
container: gitpush
|
||||||
docker build -t harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org:$(VERSION) .
|
docker build -t harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org:$(VERSION) .
|
||||||
docker push harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org:$(VERSION)
|
docker push harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org:$(VERSION)
|
||||||
|
|
||||||
|
argocd: container
|
||||||
sed -i "s,$(IMAGE_NAME):.*,$(IMAGE_NAME):$(VERSION)," $(ARGOCD_APP)
|
sed -i "s,$(IMAGE_NAME):.*,$(IMAGE_NAME):$(VERSION)," $(ARGOCD_APP)
|
||||||
cd $(ARGOCD_HOME) && git add $(ARGOCD_YAML) && git commit -m "Update www.nico.schottelius.org to $(VERSION)" && git push
|
cd $(ARGOCD_HOME) && git add $(ARGOCD_YAML) && git commit -m "Update www.nico.schottelius.org to $(VERSION)" && git push
|
||||||
|
|
||||||
|
setup:
|
||||||
|
$(IKIWIKI) --refresh --setup ikiwiki.setup
|
||||||
|
|
||||||
lall:
|
lall:
|
||||||
$(IKIWIKI) --refresh --setup ikiwiki.setup --set destdir=../dst --set srcdir=. --set git_wrapper= --set git_wrappermode= --set gitorigin_branch= --set gitmaster_branch=
|
$(IKIWIKI) --refresh --setup ikiwiki.setup --set destdir=../dst --set srcdir=. --set git_wrapper= --set git_wrappermode= --set gitorigin_branch= --set gitmaster_branch=
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue