updates for container

This commit is contained in:
Nico Schottelius 2024-10-11 23:22:48 +09:00
parent 98c02fe122
commit 7b591fca73
3 changed files with 8 additions and 3 deletions

View file

@ -3,7 +3,7 @@ FROM alpine:3.20
RUN apk add --no-cache ikiwiki RUN apk add --no-cache ikiwiki
COPY . /build COPY . /build
WORKDIR /build WORKDIR /build
RUN ikiwiki --refresh --setup ikiwiki.setup RUN ikiwiki --rebuild --setup ikiwiki.setup
FROM nginx:alpine FROM nginx:alpine
COPY --from=0 /tmp/www /usr/share/nginx/html COPY --from=0 /tmp/www /usr/share/nginx/html

View file

@ -4,11 +4,17 @@ BROWSER=conkeror
#IKIWIKI=ikiwikitest.sh #IKIWIKI=ikiwikitest.sh
IKIWIKI=ikiwiki IKIWIKI=ikiwiki
VERSION=$(shell git describe --always)
pub: pub:
git push --mirror git push --mirror
all: all:
$(IKIWIKI) --refresh --setup ikiwiki.setup $(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: 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=
@ -36,4 +42,3 @@ clean: all
# @echo "Press return to publish..." # @echo "Press return to publish..."
# @read avariable # @read avariable
# git push --mirror # git push --mirror

View file

@ -30,7 +30,7 @@ use IkiWiki::Setup::Standard {
# rcs backend to use # rcs backend to use
rcs => '', rcs => '',
# plugins to add to the default configuration # 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", flattr_userid => "telmich",