3 files changed, 11 insertions(+), 5 deletions(-)
M Makefile
M README.md
R docker-compose.yml => compose/docker-compose.yml
M Makefile => Makefile +5 -2
@@ 5,11 5,12 @@ UPSTREAM_GPG="FAF7B393"
CONMAN=docker
+.PHONY: clean
clean:
$(CONMAN) image rm --force my-moin || true
rm -rf build/*
-download:
+build/moin.tar.gz:
mkdir -p build
curl ${UPSTREAM_URL_MOIN} --output build/moin.tar.gz
curl ${UPSTREAM_URL_SIG} --output build/moin.tar.gz.asc
@@ 18,6 19,8 @@ download:
gpg --verify build/moin.tar.gz.asc build/moin.tar.gz
tar xzf build/moin.tar.gz --directory build/
-image: clean download
+.PHONY: image
+image: build/moin.tar.gz
+ test -f /var/deploy/conf/moinmoin/wikiconfig.py && cp /var/deploy/conf/moinmoin/wikiconfig.py moinmoin/ || true
$(CONMAN) build --tag my-moin .
M README.md => README.md +6 -3
@@ 2,7 2,7 @@
Deploy a moinmoin1.9 wiki using Docker.
-This iamge cannot be recommended in good conscience.
+This image cannot be recommended in good conscience.
`python2.7` has been unsupported since January 2020.
Alpine 3.10 has been unsupported since May 2021.
@@ 27,6 27,9 @@ as well as your own account name (`s/your_name_here/MyName/g`).
> As a reminder, to access a shell inside a container, try
> `docker exec -it <CONTAINER> /bin/sh`.
+The `Makefile` recipe overwrites `moinmoin/wikiconfig.py` with
+`/var/deploy/conf/moinmoin/wikiconfig.py` if it exists.
+
Start the container and connect for the first time.
Open the LanguageSetup page.
Follow on-screen instructions for installing system (i.e. underlay) pages.
@@ 35,8 38,8 @@ Follow on-screen instructions for installing system (i.e. underlay) pages.
## Structure
This container will expose uWSGI on port 9000.
-The `nginx` folder contains a recommended web server configuration.
-See also the `compose` folder for a suggested Docker compose file.
+The `nginx/` folder contains a recommended web server configuration.
+See also the `compose/` folder for a suggested Docker compose file.
The wiki is served from `/var/moin/webroot`.
uWSGI runs in this directory as `www-data`.
R docker-compose.yml => compose/docker-compose.yml +0 -0