Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
dd42a259e5 | |||
b9f0362b30 | |||
9a8e3e6005 | |||
|
e2db62e0c0 | ||
e90192b93f | |||
2504384fc4 | |||
8fd9adf232 | |||
8b8f129f07 | |||
fdb5ebb73d | |||
219e5b2601 | |||
333989c606 | |||
5b74152137 | |||
|
d4aa21b680 | ||
4c286521eb | |||
|
429f5d20c7 | ||
|
1aa19414ef | ||
9e349de285 | |||
|
6512a9d91a | ||
|
e946812697 | ||
|
a5080d3534 | ||
|
3270aac81d | ||
|
9bbac5f07e | ||
|
6d88837af8 | ||
|
2fb80756bb | ||
|
d4d79e3379 | ||
|
70b28d08b0 | ||
|
487cfde0e3 | ||
|
a427cb02a5 | ||
|
2583e49cc5 |
@ -7,14 +7,14 @@ RUN apk add --update --no-cache \
|
||||
|
||||
WORKDIR "/home/node"
|
||||
|
||||
ARG WIKI_PACKAGE=wiki@0.31.0
|
||||
ARG WIKI_PACKAGE=wiki@0.37.0
|
||||
|
||||
USER node
|
||||
|
||||
RUN npm install -g --prefix . $WIKI_PACKAGE
|
||||
RUN cd lib/node_modules/wiki/node_modules && \
|
||||
rm -r wiki-security-passportjs && \
|
||||
git clone https://git.coopcloud.tech/3wordchant/wiki-security-passportjs.git
|
||||
git clone https://git.coopcloud.tech/wiki-cafe/wiki-security-passportjs.git
|
||||
|
||||
RUN cd lib/node_modules/wiki/node_modules/wiki-security-passportjs && \
|
||||
npm install && \
|
||||
|
35
README.md
35
README.md
@ -31,24 +31,43 @@ IMAGE=dobbs/farm:$TAG
|
||||
docker build --tag $IMAGE .
|
||||
```
|
||||
|
||||
# Publish containers
|
||||
|
||||
GitHub
|
||||
You might also want to remember the most recent tag:
|
||||
|
||||
``` bash
|
||||
git tag -am "" "$TAG"
|
||||
git push --atomic origin main "$TAG"
|
||||
git tag --list | tail -1
|
||||
```
|
||||
|
||||
Docker Hub
|
||||
Update WIKI_VERSIONS.txt
|
||||
|
||||
``` bash
|
||||
docker build --tag $IMAGE . # if you haven't already
|
||||
docker build --tag dobbs/farm:latest . # if you haven't already
|
||||
docker run --rm $IMAGE wiki --version > WIKI_VERSIONS.txt
|
||||
```
|
||||
|
||||
# Publish container images
|
||||
|
||||
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 "update WIKI_VERSIONS.txt for $TAG"
|
||||
git tag -am "" "$TAG"
|
||||
git push --atomic origin main "$TAG"
|
||||
docker push $IMAGE
|
||||
docker push dobbs/farm:latest
|
||||
```
|
||||
|
||||
Sometimes we publish a docker image with no changes to the wiki source
|
||||
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`.
|
||||
|
||||
# Experiment with K8S
|
||||
|
||||
With the local kubernetes example (see [examples/k8s/README.md](./examples/k8s/README.md)):
|
||||
|
46
WIKI_VERSIONS.txt
Normal file
46
WIKI_VERSIONS.txt
Normal file
@ -0,0 +1,46 @@
|
||||
wiki: 0.37.0
|
||||
wiki-server: 0.25.2
|
||||
wiki-client: 0.30.1
|
||||
wiki-security-friends: 0.2.5
|
||||
wiki-security-passportjs: 0.10.0
|
||||
wiki-plugin-activity: 0.6.1
|
||||
wiki-plugin-assets: 0.5.1
|
||||
wiki-plugin-audio: 0.2.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.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.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.1
|
||||
wiki-plugin-image: 0.5.0
|
||||
wiki-plugin-line: 0.5.0
|
||||
wiki-plugin-map: 0.8.0
|
||||
wiki-plugin-markdown: 0.4.2
|
||||
wiki-plugin-math: 0.1.0
|
||||
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.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.5.0
|
||||
wiki-plugin-search: 0.2.0
|
||||
wiki-plugin-transport: 0.2.0
|
||||
wiki-plugin-video: 0.3.1
|
Loading…
x
Reference in New Issue
Block a user