Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
6eea65be60 | |||
6eb8631f9e | |||
502d6ccec7 | |||
cb3aa63370 | |||
e59495665c | |||
fb79fe0dc8 | |||
bd2619a14b | |||
54f1c382f5 | |||
218128db23 | |||
6f9ed1279c | |||
2ff3dcad1e | |||
eab72db590 | |||
04c3ba7fe1 | |||
8d7d0e5119 | |||
1cf4d8e6ae |
@ -5,7 +5,7 @@ RUN apk add --update --no-cache \
|
||||
git \
|
||||
jq
|
||||
WORKDIR "/home/node"
|
||||
ARG WIKI_PACKAGE=wiki@0.22
|
||||
ARG WIKI_PACKAGE=wiki@0.28.0
|
||||
RUN su node -c "npm install -g --prefix . $WIKI_PACKAGE"
|
||||
RUN su node -c "mkdir -p .wiki"
|
||||
VOLUME "/home/node/.wiki"
|
||||
|
59
README.md
59
README.md
@ -7,7 +7,7 @@ Start Playing Federated Wiki: http://start.fed.wiki
|
||||
docker run -p 3000:3000 -it --rm \
|
||||
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
|
||||
|
||||
@ -17,22 +17,6 @@ Visit http://localhost:3000 and http://anything.localtest.me:3000
|
||||
|
||||
Your wiki pages and configuration will be saved in the ~/.wiki folder.
|
||||
|
||||
# Release Notes for 1.0.0
|
||||
|
||||
This is a significant **breaking** change from pre-1.0 releases. Especially:
|
||||
|
||||
* changed the user from `app` (`uid=1001(app) gid=1001(app) groups=1001(app)`)
|
||||
to `node` (`uid=1000(node) gid=1000(node) groups=1000(node),1000(node)`)
|
||||
|
||||
* no longer installing `bash`, `configure-wiki`, nor `set-owner-name`
|
||||
|
||||
* no longer creating `/home/app/.wiki/wiki.json`
|
||||
|
||||
Those changes in particular will impose some work on authors upgrading
|
||||
from previous versions.
|
||||
|
||||
The last non-breaking revision is 0.52.0 https://github.com/dobbs/farm/tree/0.52.0#readme
|
||||
|
||||
# Development
|
||||
|
||||
This image's tag does not match the version of the included wiki
|
||||
@ -42,27 +26,36 @@ devops pipeline.
|
||||
Testing new images locally:
|
||||
|
||||
``` bash
|
||||
IMAGE=dobbs/farm:1.0.7-pre-22
|
||||
TAG=1.0.14-prefer-title
|
||||
IMAGE=dobbs/farm:$TAG
|
||||
docker build --tag $IMAGE .
|
||||
```
|
||||
|
||||
# Publish containers
|
||||
|
||||
GitHub
|
||||
|
||||
``` bash
|
||||
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
|
||||
```
|
||||
|
||||
# Experiment with K8S
|
||||
|
||||
With the local kubernetes example (see [examples/k8s/README.md](./examples/k8s/README.md)):
|
||||
|
||||
``` bash
|
||||
export IMAGE=dobbs/farm:1.0.7-pre-22
|
||||
docker build --tag $IMAGE .
|
||||
k3d image import $IMAGE --cluster wiki
|
||||
cd ./examples/k8s/
|
||||
perl -pi -e 's{^(\s+image:\s*).*$}{\1 $ENV["IMAGE"]}' wiki.yaml
|
||||
kubectl apply -f wiki.yaml
|
||||
```
|
||||
|
||||
The repos in Dockerhub and GitHub are configured to automatically build new tags.
|
||||
|
||||
# Publish experimental plugins
|
||||
|
||||
Invoke Dockerhub and GitHub integration.
|
||||
``` bash
|
||||
git tag -am "" '1.0.2-pre-0217'
|
||||
git push --atomic origin main '1.0.2-pre-0217'
|
||||
kubectl patch deployment.apps/wiki-deployment \
|
||||
--type='json' \
|
||||
-p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"'$IMAGE'"}]'
|
||||
```
|
||||
|
15
RELEASE-NOTES-1.0.0.md
Normal file
15
RELEASE-NOTES-1.0.0.md
Normal file
@ -0,0 +1,15 @@
|
||||
# Release Notes for 1.0.0
|
||||
|
||||
This is a significant **breaking** change from pre-1.0 releases. Especially:
|
||||
|
||||
* changed the user from `app` (`uid=1001(app) gid=1001(app) groups=1001(app)`)
|
||||
to `node` (`uid=1000(node) gid=1000(node) groups=1000(node),1000(node)`)
|
||||
|
||||
* no longer installing `bash`, `configure-wiki`, nor `set-owner-name`
|
||||
|
||||
* no longer creating `/home/app/.wiki/wiki.json`
|
||||
|
||||
Those changes in particular will impose some work on authors upgrading
|
||||
from previous versions.
|
||||
|
||||
The last non-breaking revision is 0.52.0 https://github.com/dobbs/farm/tree/0.52.0#readme
|
@ -49,7 +49,7 @@ using wiki to drive some learning about kubernetes.
|
||||
|
||||
# Deploy Wiki
|
||||
|
||||
kubectl apply -f wiki.yaml
|
||||
kubectl apply -f http://deploy.wiki.do/assets/wiki/wiki.yaml
|
||||
|
||||
# Play with the wiki
|
||||
|
||||
|
@ -1,64 +0,0 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: wiki-deployment
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: wiki
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: wiki
|
||||
spec:
|
||||
securityContext:
|
||||
runAsUser: 1000
|
||||
runAsGroup: 1000
|
||||
fsGroup: 1000
|
||||
containers:
|
||||
- name: farm
|
||||
image: dobbs/farm:1.0.6
|
||||
command: ["wiki"]
|
||||
ports:
|
||||
- containerPort: 3000
|
||||
volumeMounts:
|
||||
- name: dot-wiki
|
||||
mountPath: /home/node/.wiki
|
||||
- name: fedwiki
|
||||
mountPath: /home/node/fedwiki
|
||||
volumes:
|
||||
- name: dot-wiki
|
||||
hostPath:
|
||||
path: /macos/.wiki-k8s
|
||||
- name: fedwiki
|
||||
hostPath:
|
||||
path: /macos/fedwiki
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: wiki-service
|
||||
spec:
|
||||
ports:
|
||||
- name: http
|
||||
targetPort: 3000
|
||||
port: 80
|
||||
selector:
|
||||
app: wiki
|
||||
---
|
||||
apiVersion: extensions/v1beta1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: wiki
|
||||
spec:
|
||||
rules:
|
||||
- host: "*.localhost"
|
||||
http: &wiki
|
||||
paths:
|
||||
- path: /
|
||||
backend:
|
||||
serviceName: wiki-service
|
||||
servicePort: http
|
||||
# - host: "*.example.com"
|
||||
# http: *wiki
|
Reference in New Issue
Block a user