4 Commits

Author SHA1 Message Date
bd2619a14b upgrade to wiki 0.24.0 2021-04-24 10:10:40 -06:00
54f1c382f5 recent browsers do the right thing with *.localhost
with this update we can remove the last mention of localtest.me
2021-02-28 13:46:36 -07:00
218128db23 Improve development docs
We've learned how to use kubectl patch for local testing

We've also abandoned the automation between github and dockerhub
because we publish updates with sufficient irregularity that it is
better if we take the steps more manually and verify each as we go.
2021-02-28 13:40:10 -07:00
6f9ed1279c upgrade to wiki 0.23.0 + wiki-client 0.23.0 with feeling
previous attempt didn't actually install the new wiki-client
fixed the previous single & between cd and npm install --save
2021-02-28 13:30:18 -07:00
2 changed files with 18 additions and 17 deletions

View File

@ -5,10 +5,8 @@ RUN apk add --update --no-cache \
git \ git \
jq jq
WORKDIR "/home/node" WORKDIR "/home/node"
ARG WIKI_PACKAGE=wiki@0.23 ARG WIKI_PACKAGE=wiki@0.24.0
ARG WIKI_CLIENT=wiki-client@0.23.0 RUN su node -c "npm install -g --prefix . $WIKI_PACKAGE"
RUN su node -c "npm install -g --prefix . $WIKI_PACKAGE" \
&& su node -c "cd /home/node/lib/node_modules/wiki & npm install --save $WIKI_CLIENT"
RUN su node -c "mkdir -p .wiki" RUN su node -c "mkdir -p .wiki"
VOLUME "/home/node/.wiki" VOLUME "/home/node/.wiki"
EXPOSE 3000 EXPOSE 3000

View File

@ -7,7 +7,7 @@ Start Playing Federated Wiki: http://start.fed.wiki
docker run -p 3000:3000 -it --rm \ docker run -p 3000:3000 -it --rm \
dobbs/farm dobbs/farm
Visit http://localhost:3000 and http://anything.localtest.me:3000 Visit http://localhost:3000 and http://anything.localhost:3000
### Run a local wiki that will survive a reboot ### Run a local wiki that will survive a reboot
@ -26,27 +26,30 @@ devops pipeline.
Testing new images locally: Testing new images locally:
``` bash ``` bash
IMAGE=dobbs/farm:1.0.7-pre-22 TAG=1.0.8-prefer-title
IMAGE=dobbs/farm:$TAG
docker build --tag $IMAGE . docker build --tag $IMAGE .
``` ```
With the local kubernetes example (see [examples/k8s/README.md](./examples/k8s/README.md)): With the local kubernetes example (see [examples/k8s/README.md](./examples/k8s/README.md)):
``` bash ``` bash
export IMAGE=dobbs/farm:1.0.7-pre-22
docker build --tag $IMAGE .
k3d image import $IMAGE --cluster wiki k3d image import $IMAGE --cluster wiki
cd ./examples/k8s/ kubectl patch deployment.apps/wiki-deployment \
perl -pi -e 's{^(\s+image:\s*).*$}{\1 $ENV["IMAGE"]}' wiki.yaml --type='json' \
kubectl apply -f wiki.yaml -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"'$IMAGE'"}]'
``` ```
The repos in Dockerhub and GitHub are configured to automatically build new tags. # Publish containers with experimental code
# Publish experimental plugins GitHub
Invoke Dockerhub and GitHub integration.
``` bash ``` bash
git tag -am "" '1.0.2-pre-0217' git tag -am "" "$TAG"
git push --atomic origin main '1.0.2-pre-0217' git push --atomic origin main "$TAG"
```
Docker Hub
``` bash
docker push $IMAGE
``` ```