.drone.yml

@@ -1,14 +0,0 @@
----
-kind: pipeline
-name: publish docker image
-steps:
-  - name: build and publish
-    image: plugins/docker
-    settings:
-      username: 3wordchant
-      password:
-        from_secret: git_coopcloud_tech_token_3wc
-      repo: git.coopcloud.tech/wiki-cafe/wiki-farm
-      auto_tag: true
-      tags: latest
-      registry: git.coopcloud.tech

Dockerfile

@@ -4,32 +4,14 @@ RUN apk add --update --no-cache \
   dumb-init \
   git \
   jq
-
 WORKDIR "/home/node"
-
-ARG WIKI_PACKAGE=wiki@0.37.0
-
-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/wiki-cafe/wiki-security-passportjs.git
-
-RUN cd lib/node_modules/wiki/node_modules/wiki-security-passportjs && \
-  npm install && \
-  node_modules/grunt/bin/grunt
-
-RUN mkdir -p .wiki
-
+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"
-
 EXPOSE 3000
-
+USER node
 ENV PATH="${PATH}:/home/node/bin"
-
 ENV NPM_CONFIG_PREFIX="${HOME}"
-
 ENTRYPOINT ["dumb-init"]
-
-CMD ["wiki", "--farm"]
+CMD ["wiki", "--farm", "--security_type=friends"]

README.md

@@ -26,50 +26,11 @@ devops pipeline.
 Testing new images locally:
 
 ``` bash
-TAG=1.0.14-prefer-title
+TAG=1.0.8-prefer-title
 IMAGE=dobbs/farm:$TAG
 docker build --tag $IMAGE .
 ```
 
-You might also want to remember the most recent tag:
-
-``` bash
-git tag --list | tail -1
-```
-
-Update WIKI_VERSIONS.txt
-
-``` bash
-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)):
 
 ``` bash
@@ -78,3 +39,18 @@ kubectl patch deployment.apps/wiki-deployment \
   --type='json' \
   -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"'$IMAGE'"}]'
 ```
+
+# Publish containers
+
+GitHub
+``` bash
+git tag -am "" "$TAG"
+git push --atomic origin main "$TAG"
+```
+
+Docker Hub
+
+``` bash
+docker push $IMAGE
+docker push dobbs/farm:latest
+```

WIKI_VERSIONS.txt

@@ -1,46 +0,0 @@
-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