diff --git a/Dockerfile b/Dockerfile index 34f91be..83b6083 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apk add --update --no-cache \ git \ jq WORKDIR "/home/node" -ARG WIKI_PACKAGE=wiki@0.36.1 +ARG WIKI_PACKAGE=wiki@0.37.0 RUN su node -c "npm install -g --prefix . $WIKI_PACKAGE" RUN su node -c "mkdir -p .wiki" VOLUME "/home/node/.wiki" diff --git a/README.md b/README.md index 36a97b3..86b1d73 100644 --- a/README.md +++ b/README.md @@ -45,18 +45,20 @@ docker run --rm $IMAGE wiki --version > WIKI_VERSIONS.txt # Publish container images -GitHub - +End-to-end recipe to publish a new version. May require judgment in +the steps before git push and docker push. ``` bash +# Emit current version to standard error and next version to standard out. +# use that to assign the next TAG +TAG="$(git tag --list | tail -1 | perl -lne 'print STDERR $_;s/(\d+)$/$1+1/e;print $_;')" +IMAGE=dobbs/farm:$TAG +docker build --no-cache --tag $IMAGE . +docker build --tag dobbs/farm:latest . +docker run --rm $IMAGE wiki --version > WIKI_VERSIONS.txt +git add +git commit -m "" git tag -am "" "$TAG" git push --atomic origin main "$TAG" -``` - -Docker Hub - -``` bash -docker build --tag $IMAGE . # if you haven't already -docker build --tag dobbs/farm:latest . # if you haven't already docker push $IMAGE docker push dobbs/farm:latest ``` @@ -66,25 +68,6 @@ code. This allows us to pick up non-breaking changes to some of the plugins. Using `--no-cache` ensures docker re-runs this line from the `Dockerfile` in particular: `npm install -g --prefix . $WIKI_PACKAGE`. -``` bash -docker build --no-cache --tag $IMAGE . # if you haven't already -docker build --tag dobbs/farm:latest . # if you haven't already -docker push $IMAGE -docker push dobbs/farm:latest -``` - -## Publish with updated wiki dependencies - -We published 1.0.16 on May 2. The friends security plugin was updated -to 0.2.5 on May 17. See [fedwiki/wiki-security-friends](https://github.com/fedwiki/wiki-security-friends/tree/bf8a1631806829cb8c20614be1642d80b0bd5cfb) - -We built a new image with no changes to our Dockerfile and published -it as version 1.0.17. The only change for 1.0.17 is this updated -README.md so we can remember how to do this again in the future. - -We chose our tag and followed exactly the same steps above to publish -container images. - # Experiment with K8S With the local kubernetes example (see [examples/k8s/README.md](./examples/k8s/README.md)): diff --git a/WIKI_VERSIONS.txt b/WIKI_VERSIONS.txt index bdf89e9..8f05087 100644 --- a/WIKI_VERSIONS.txt +++ b/WIKI_VERSIONS.txt @@ -1,29 +1,29 @@ -wiki: 0.36.1 -wiki-server: 0.24.3 -wiki-client: 0.29.2 +wiki: 0.37.0 +wiki-server: 0.25.0 +wiki-client: 0.30.0 wiki-security-friends: 0.2.5 -wiki-security-passportjs: 0.9.0 +wiki-security-passportjs: 0.10.0 wiki-plugin-activity: 0.6.0 wiki-plugin-assets: 0.5.1 wiki-plugin-audio: 0.2.0 -wiki-plugin-bars: 0.4.0 +wiki-plugin-bars: 0.5.0 wiki-plugin-calculator: 0.5.0 wiki-plugin-calendar: 0.3.0 wiki-plugin-changes: 0.4.0 wiki-plugin-chart: 0.4.0 -wiki-plugin-code: 0.3.1 +wiki-plugin-code: 0.4.0 wiki-plugin-data: 0.3.0 wiki-plugin-factory: 0.3.0 wiki-plugin-favicon: 0.3.0 wiki-plugin-flagmatic: 0.2.0 -wiki-plugin-force: 0.4.0 +wiki-plugin-force: 0.5.0 wiki-plugin-frame: 0.10.3 wiki-plugin-future: 0.4.0 wiki-plugin-graphviz: 0.11.3 wiki-plugin-grep: 1.1.0 -wiki-plugin-html: 0.5.0 +wiki-plugin-html: 0.5.1 wiki-plugin-image: 0.5.0 -wiki-plugin-line: 0.4.0 +wiki-plugin-line: 0.5.0 wiki-plugin-map: 0.8.0 wiki-plugin-markdown: 0.4.1 wiki-plugin-math: 0.1.0 @@ -31,16 +31,16 @@ wiki-plugin-metabolism: 0.3.0 wiki-plugin-method: 0.3.0 wiki-plugin-pagefold: 0.3.0 wiki-plugin-paragraph: 0.3.0 -wiki-plugin-plugmatic: 1.3.0 -wiki-plugin-pushpin: 0.4.0 -wiki-plugin-radar: 0.4.0 +wiki-plugin-plugmatic: 1.3.1 +wiki-plugin-pushpin: 0.5.0 +wiki-plugin-radar: 0.5.0 wiki-plugin-recycler: 0.3.0 wiki-plugin-reduce: 0.3.0 wiki-plugin-reference: 0.3.0 wiki-plugin-report: 0.3.0 wiki-plugin-rollup: 0.3.0 wiki-plugin-roster: 0.3.0 -wiki-plugin-scatter: 0.4.0 +wiki-plugin-scatter: 0.5.0 wiki-plugin-search: 0.2.0 wiki-plugin-transport: 0.2.0 wiki-plugin-video: 0.3.1