Compare commits

...

27 Commits
1.0.28 ... main

Author SHA1 Message Date
3wc
dd42a259e5 Revert "Cache bust"
[ci skip]

This reverts commit b9f0362b30670cd0b8edc75802b2458fb5500f21.
2024-11-06 21:53:39 -05:00
3wc
b9f0362b30 Cache bust
All checks were successful
continuous-integration/drone/push Build is passing
2024-11-06 21:49:21 -05:00
3wc
9a8e3e6005 Merge remote-tracking branch 'upstream/main'
All checks were successful
continuous-integration/drone/push Build is passing
2024-11-06 20:16:23 -05:00
Eric Dobbs
e2db62e0c0 update WIKI_VERSIONS.txt for 1.0.29 2024-11-06 16:05:27 -07:00
3wc
e90192b93f Revert "Reapply "Slightly less cursed way of installing forked w-s-p""
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
This reverts commit 8b8f129f076bed377801f141e9227fb1f11ce22a.
2024-10-22 14:12:57 -04:00
3wc
2504384fc4 Revert "Another attempt at more resilient building"
This reverts commit 8fd9adf232b7963e96250a0a08fbe3082e0cbf78.
2024-10-22 14:12:52 -04:00
3wc
8fd9adf232 Another attempt at more resilient building
All checks were successful
continuous-integration/drone/push Build is passing
2024-10-22 14:02:55 -04:00
3wc
8b8f129f07 Reapply "Slightly less cursed way of installing forked w-s-p"
This reverts commit fdb5ebb73d11989b94bbc6622c13d13bed63bcbc.
2024-10-22 13:40:46 -04:00
3wc
fdb5ebb73d Revert "Slightly less cursed way of installing forked w-s-p"
All checks were successful
continuous-integration/drone/push Build is passing
This reverts commit 5b7415213745c7c7b3c08bdf0892f14fa0ec7ae7.
2024-10-22 12:56:08 -04:00
3wc
219e5b2601 Revert "Run npm install and grunt"
This reverts commit 333989c606e689fdded23143768b969617f9160d.
2024-10-22 12:55:36 -04:00
3wc
333989c606 Run npm install and grunt
All checks were successful
continuous-integration/drone/push Build is passing
2024-10-22 12:51:31 -04:00
3wc
5b74152137 Slightly less cursed way of installing forked w-s-p
All checks were successful
continuous-integration/drone/push Build is passing
2024-10-22 12:33:55 -04:00
Robert Best
d4aa21b680 change dockerfile to wiki-cafe version of passportjs repo
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
2024-09-20 22:09:23 -04:00
Eric Dobbs
429f5d20c7 upgrade to wiki 0.37.0 2024-08-25 12:14:31 -06:00
Eric Dobbs
1aa19414ef update frame and graphviz plugins 2024-08-04 15:37:33 -06:00
Eric Dobbs
6512a9d91a upgrade to wiki 0.36.1 2024-05-12 15:29:27 -06:00
Eric Dobbs
e946812697 upgrade to wiki 0.36.0 2024-05-12 08:32:37 -06:00
Eric Dobbs
a5080d3534 upgrade to wiki 0.35.1 2024-03-09 09:07:50 -07:00
Eric Dobbs
3270aac81d upgrade to wiki 0.35.0 2024-02-29 21:02:34 -07:00
Eric Dobbs
9bbac5f07e update WIKI_VERSIONS.txt for 1.0.22 2024-02-17 10:15:09 -07:00
Eric Dobbs
6d88837af8 use $IMAGE in the runbook for updating WIKI_VERSIONS.txt 2023-11-22 09:09:39 -07:00
Eric Dobbs
2fb80756bb publish WIKI_VERSIONS.txt
I do this trick to double-check my work anyway. Might as well include
it where others can see or independently verify.
2023-11-22 09:03:59 -07:00
Eric Dobbs
d4d79e3379 upgrade to wiki 0.32.1 2023-11-22 08:51:33 -07:00
Eric Dobbs
70b28d08b0 add detail to README to explain benefits of --no-cache 2023-10-08 13:24:55 -06:00
Eric Dobbs
487cfde0e3 upgrade to wiki 0.31.0 2023-08-22 06:53:52 -06:00
Eric Dobbs
a427cb02a5 added notes to publish 1.0.17 2023-06-21 08:05:53 -06:00
Eric Dobbs
2583e49cc5 1.0.16 upgrade to wiki 0.29.0 2023-05-02 08:44:21 -06:00
3 changed files with 74 additions and 9 deletions

View File

@ -14,7 +14,7 @@ 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 && \

View File

@ -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
View 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