nico/www.nico.schottelius.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improvements, improvements, ...

Browse source
This commit is contained in:
Nico Schottelius 2024-10-12 00:17:46 +09:00
parent 5c11a0b724
commit 5f6748f627
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -1,13 +1,14 @@
DESTDIR=/home/users/nico/privat/rechner/netz/seiten/www.nico.schottelius.org/dst/ DESTDIR=/home/users/nico/privat/rechner/netz/seiten/www.nico.schottelius.org/dst/
PUBDIR=tee.schottelius.org:/home/services/www/nico/www.nico.schottelius.org/www/ PUBDIR=tee.schottelius.org:/home/services/www/nico/www.nico.schottelius.org/www/
BROWSER=conkeror BROWSER=conkeror
#IKIWIKI=ikiwikitest.sh
IKIWIKI=ikiwiki IKIWIKI=ikiwiki
VERSION=$(shell git describe --always) VERSION=$(shell git describe --always)
ARGOCD_HOME=$HOME/vcs/k8s-config/cluster/p10/apps/templates/ ARGOCD_HOME=$(shell echo $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
all: container all: container
@ -19,7 +20,7 @@ setup:
container: container:
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)
sed -i "s,harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org:.*,harbor.k8s.ungleich.ch/nico/www.nico.schottelius.org:$(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
lall: lall:
@ -36,16 +37,3 @@ view:
clean: all clean: all
rm -rf ${DESTDIR} rm -rf ${DESTDIR}
#public: ask public-f
#public-f: all
# find ${DESTDIR} -type f -exec chmod 0644 {} \;
# find ${DESTDIR} -type d -exec chmod 0755 {} \;
# rsync -av --delete ${DESTDIR} ${PUBDIR}
#ask:
# @echo "Press return to publish..."
# @read avariable
# git push --mirror