Compare commits
4 Commits
1.0.7
...
1.0.9-wiki
Author | SHA1 | Date | |
---|---|---|---|
eab72db590 | |||
04c3ba7fe1 | |||
8d7d0e5119 | |||
1cf4d8e6ae |
@ -5,8 +5,10 @@ RUN apk add --update --no-cache \
|
|||||||
git \
|
git \
|
||||||
jq
|
jq
|
||||||
WORKDIR "/home/node"
|
WORKDIR "/home/node"
|
||||||
ARG WIKI_PACKAGE=wiki@0.22
|
ARG WIKI_PACKAGE=wiki@0.23
|
||||||
RUN su node -c "npm install -g --prefix . $WIKI_PACKAGE"
|
ARG WIKI_CLIENT=wiki-client@v0.23.0
|
||||||
|
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
|
||||||
|
16
README.md
16
README.md
@ -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.
|
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
|
# Development
|
||||||
|
|
||||||
This image's tag does not match the version of the included wiki
|
This image's tag does not match the version of the included wiki
|
||||||
|
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
|
# Deploy Wiki
|
||||||
|
|
||||||
kubectl apply -f wiki.yaml
|
kubectl apply -f http://deploy.wiki.do/assets/wiki/wiki.yaml
|
||||||
|
|
||||||
# Play with the wiki
|
# 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