From 819c2189792b35e4889f97041cd152565623109a Mon Sep 17 00:00:00 2001
From: Twan Goosen <twan@clarin.eu>
Date: Mon, 28 Oct 2024 11:13:25 +0100
Subject: [PATCH] mkdocs docker image + start script

---
 docker/mkdocs/Dockerfile | 23 +++++++++++++----------
 serve.sh                 |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docker/mkdocs/Dockerfile b/docker/mkdocs/Dockerfile
index a7d97de..d76ba86 100644
--- a/docker/mkdocs/Dockerfile
+++ b/docker/mkdocs/Dockerfile
@@ -1,14 +1,17 @@
-FROM registry.gitlab.com/clarin-eric/docker-alpine-base:2.3.3
-
-# Alpine package dependencies
-RUN apk add --no-cache \
-		'py3-pip=22.3.1-r1'
+FROM registry.gitlab.com/clarin-eric/docker-alpine-base:2.6.9
 
 # Install mkdocs
-RUN pip install wheel && \
-	pip install \
-		mkdocs \
-		mkdocs-material
+RUN apk add --no-cache 'py3-pip=23.3.1-r0' \
+	&& python3 -m venv /mkdocs \
+	&& . /mkdocs/bin/activate \
+	&& pip install wheel \
+	&& pip install mkdocs mkdocs-material
+
+RUN echo -e \
+	"#!/usr/bin/env bash\n" \
+	"source /mkdocs/bin/activate && mkdocs \"\$@\"" \
+	> /usr/local/bin/entrypoint.sh \
+	&& chmod +x /usr/local/bin/entrypoint.sh
 
-ENTRYPOINT [ "/usr/bin/mkdocs" ]
+ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 CMD []
diff --git a/serve.sh b/serve.sh
index 93f1fe7..8a757b8 100755
--- a/serve.sh
+++ b/serve.sh
@@ -13,7 +13,7 @@ echo "Building mkdocs image"
 docker build --tag 'mkdocs:latest' 'docker/mkdocs'
 
 echo "Starting server on http://localhost:${MKDOCS_SERVER_PORT}/"
-docker run --rm --name mkdocs_serve\
+docker run --rm -ti --name mkdocs_serve\
 	-v "${SCRIPT_DIR}:/work" \
 	-w '/work' \
 	-p "${MKDOCS_SERVER_PORT}:${MKDOCS_SERVER_PORT}" \