README.md

@@ -57,15 +57,11 @@ Please use the contact details on my website and _privately_ get in touch (don't
 
 Image		     	| Purpose
 --------------------|----------------
-`archivebox`        | Dockerised [ArchiveBox](https://archivebox.io/)
 `certbot`			| Dockerised certbot via certbot-auto - currently doesn't build anymore because "certbot doesn't support your OS anymore" or something like that, but the version pushed to our private registry works just fine until we can rectify the issue
 `docker-registry-ui`| [docker registry ui](https://github.com/Joxit/docker-registry-ui), dockerised
 `etherpad`			| Dockerised [etherpad](https://etherpad.org/) (currently faulty, see [this GitHub issue](https://github.com/ether/etherpad-lite/issues/4962))
 `gossa`				| Dockerised [gossa](https://github.com/pldubouilh/gossa/)
-`imap-download`     | Fetchmail, procmail, inotifywait, and munpack working together to download emails and extract attachments. The provided fetchmailrc must be owned by `10000:10000`.
 `jellyfin`			| Dockerised [jellyfin](https://jellyfin.org/)
-`json2collectdmqtt`	| Dockerised [json2collectdmqtt](https://github.com/sbrl/json2collectdmqtt) - `KEY=value` environment file should be mounted to `/srv/env`
-`kiwix`				| Dockerised [kiwix-serve](https://kiwix.org/) - `NOMAD_PORT_KIWIX` should be the port to listen on
 `minetest`			| Dockerised server for [minetest](https://github.com/minetest/minetest),, currently under construction
 `minetest-mapserver`| Dockerised [minetest-mapserver](https://github.com/minetest-mapserver/mapserver)
 `minideb`			| Our main base image for (most) other images. Built from [minideb](https://github.com/bitnami/minideb), but customised to use our local apt-cacher-ng instance.
@@ -75,7 +71,10 @@ Image		     	| Purpose
 `paperless-ng`		| Dockerised [paperless-ng](https://github.com/jonaswinkler/paperless-ng) - currently under construction
 `redis`				| Dockerised [redis](https://redis.io/), installs the latest stable version
 `shiori`			| Dockerised [shiori](https://github.com/go-shiori/shiori), built from source
+`imap-download`     | Fetchmail, procmail, inotifywait, and munpack working together to download emails and extract attachments. The provided fetchmailrc must be owned by `10000:10000`.
+`archivebox`        | Dockerised [ArchiveBox](https://archivebox.io/)
 `tinyproxy`         | Dockerised [tinyproxy](https://tinyproxy.github.io/) - config file should be mounted read-only to `/srv/tinyproxy.conf`
+`json2collectdmqtt`	| Dockerised [json2collectdmqtt](https://github.com/sbrl/json2collectdmqtt) - `KEY=value` environment file should be mounted to `/srv/env`
 
 
 ## Docker container UID/GID map
@@ -96,7 +95,6 @@ UID     | GID	| Container				| Notes
 10300   | 10300 | tinyproxy             | 
 10400	| 10400	| json2collectdmqtt		| `chown` environment file to `10400:10400`, as it's loaded by a startup shell script inside the container
 10500	| 10500	| n8n					| 
-10600	| 10600	| kiwix					| 
 
 <!--
 Container from the main public Docker registry:

images/kiwix/Dockerfile

@@ -1,28 +0,0 @@
-ARG REPO_LOCATION
-
-FROM ${REPO_LOCATION}minideb AS builder
-
-RUN install_packages software-properties-common curl ca-certificates tar gzip
-
-RUN curl -Lo /tmp/kiwix-tools_linux-armhf.tar.gz https://download.kiwix.org/release/kiwix-tools/kiwix-tools_linux-armhf.tar.gz \
-	&& mkdir /app \
-	&& tar --strip-components=1 -xf /tmp/kiwix-tools_linux-armhf.tar.gz -C /app \
-	&& rm /tmp/kiwix-tools_linux-armhf.tar.gz
-
-FROM ${REPO_LOCATION}minideb
-
-COPY --from=builder /app /app
-
-WORKDIR /app
-
-COPY ./run.sh /srv/run.sh
-
-VOLUME /srv/data
-
-WORKDIR /app
-
-USER 10600:10600
-
-ENTRYPOINT [ "/srv/run.sh" ]
-
-CMD [ "serve" ]

images/kiwix/run.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-echo ">>> Environment:"
-echo "[wrapper] NOMAD_PORT_KIWIX=$NOMAD_PORT_KIWIX"
-echo "[wrapper] Args: $*"
-
-echo ">>> Checking environment"
-if [[ -z "${NOMAD_PORT_KIWIX}" ]]; then
-	echo "Error: The environment variable NOMAD_PORT_KIWIX is not set. It must be set to the port number to listen on." >&2;
-fi
-
-echo ">>> Starting kiwix";
-/app/kiwix-serve --library --port "${NOMAD_PORT_KIWIX}" /srv/data;

images/kiwix/type.txt

@@ -1 +0,0 @@
-docker