From 7b591fca731b9ce98a6f10be2e29624347f7b252 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Fri, 11 Oct 2024 23:22:48 +0900
Subject: [PATCH] updates for container

---
 Dockerfile    | 2 +-
 Makefile      | 7 ++++++-
 ikiwiki.setup | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d69c6424..6ef91d28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM alpine:3.20
 RUN apk add --no-cache ikiwiki
 COPY . /build
 WORKDIR /build
-RUN ikiwiki --refresh --setup ikiwiki.setup
+RUN ikiwiki --rebuild --setup ikiwiki.setup
 
 FROM nginx:alpine
 COPY --from=0 /tmp/www /usr/share/nginx/html
diff --git a/Makefile b/Makefile
index 47511fed..0ac9a32d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,17 @@ BROWSER=conkeror
 #IKIWIKI=ikiwikitest.sh
 IKIWIKI=ikiwiki
 
+VERSION=$(shell git describe --always)
+
 pub:
 	git push --mirror
 all:
 	$(IKIWIKI) --refresh --setup ikiwiki.setup
 
+container:
+	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)
+
 lall:
 	$(IKIWIKI) --refresh --setup ikiwiki.setup --set destdir=../dst --set srcdir=. --set git_wrapper= --set git_wrappermode= --set gitorigin_branch= --set gitmaster_branch=
 
@@ -36,4 +42,3 @@ clean: all
 #	@echo "Press return to publish..."
 #	@read avariable
 #	git push --mirror
-
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 83695d2d..f9945221 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -30,7 +30,7 @@ use IkiWiki::Setup::Standard {
 	# rcs backend to use
 	rcs => '',
 	# plugins to add to the default configuration
-	add_plugins => [qw{goodstuff meta sidebar tag rawhtml flattr}],
+	add_plugins => [qw{git goodstuff meta sidebar tag rawhtml flattr}],
 
     flattr_userid => "telmich",