upgrade to wiki@0.22
This commit is contained in:
parent
aa23f2f9b3
commit
b2b868f0be
|
@ -5,15 +5,13 @@ RUN apk add --update --no-cache \
|
|||
git \
|
||||
jq
|
||||
WORKDIR "/home/node"
|
||||
ARG WIKI_PACKAGE=wiki@0.21.2
|
||||
ARG WIKI_PACKAGE=wiki@0.22
|
||||
RUN su node -c "npm install -g --prefix . $WIKI_PACKAGE"
|
||||
RUN su node -c "mkdir -p .wiki"
|
||||
VOLUME "/home/node/.wiki"
|
||||
EXPOSE 3000
|
||||
USER node
|
||||
ENV PATH="${PATH}:/home/node/bin"
|
||||
# Adding this line to make local plugin development easier
|
||||
# see https://local-farm.wiki.dbbs.co/make-a-new-plugin.html
|
||||
ENV NPM_CONFIG_PREFIX="${HOME}"
|
||||
ENTRYPOINT ["dumb-init"]
|
||||
CMD ["wiki", "--farm", "--security_type=friends"]
|
||||
|
|
22
README.md
22
README.md
|
@ -37,16 +37,24 @@ The last non-breaking revision is 0.52.0 https://github.com/dobbs/farm/tree/0.52
|
|||
|
||||
This image's tag does not match the version of the included wiki
|
||||
software. Our version indicates the scale of changes in this tiny
|
||||
devops pipeline. For example, when we changed the `USER` directive and
|
||||
removed the wiki config generation scripts, we bumped the major
|
||||
version from 0.50.x to 1.0.x.
|
||||
devops pipeline.
|
||||
|
||||
Notes to self:
|
||||
Testing new images locally:
|
||||
|
||||
``` bash
|
||||
docker build --tag dobbs/farm:1.0.2 .
|
||||
git tag -am "" '1.0.2'
|
||||
git push origin '1.0.2'
|
||||
IMAGE=dobbs/farm:1.0.7-pre-22
|
||||
docker build --tag $IMAGE .
|
||||
```
|
||||
|
||||
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.
|
||||
|
|
Loading…
Reference in New Issue