From 31e2b756ab28e086de267df56d66b5479f76793e Mon Sep 17 00:00:00 2001
From: Dominik Thalhammer <dominik@thalhammer.it>
Date: Sat, 29 Jun 2024 21:26:09 +0200
Subject: [PATCH] Fix docker build

---
 Docker.sh                                     |  4 ----
 Dockerfile                                    | 16 ---------------
 docker/Dockerfile                             | 20 +++++++++++++++++++
 docker/README.md                              |  9 +++++++++
 .../docker-entrypoint.sh                      |  2 ++
 requirements.txt                              |  1 -
 6 files changed, 31 insertions(+), 21 deletions(-)
 delete mode 100755 Docker.sh
 delete mode 100644 Dockerfile
 create mode 100644 docker/Dockerfile
 create mode 100644 docker/README.md
 rename docker-entrypoint.sh => docker/docker-entrypoint.sh (85%)

diff --git a/Docker.sh b/Docker.sh
deleted file mode 100755
index 286ef0d..0000000
--- a/Docker.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-docker build --no-cache --tag homie-site:dev .
-#docker run --rm -t homie-site:dev
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 6d84baf..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM python:3.11.7-bullseye
-
-# Copy the local repo contents
-COPY ./ /work
-WORKDIR /work
-
-
-RUN pip install -r requirements.txt
-
-
-# Install Hugo
-RUN wget https://github.com/gohugoio/hugo/releases/download/v0.102.3/hugo_extended_0.102.3_Linux-64bit.deb -O /tmp/hugo.deb \
-    && dpkg -i /tmp/hugo.deb
-
-
-ENTRYPOINT ["/work/docker-entrypoint.sh"]
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..fff9182
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,20 @@
+FROM python:3.12-slim-bookworm
+
+RUN apt update \
+    && apt install -y wget git \
+    && git config --global --add safe.directory '*'
+
+# Copy the local repo contents
+COPY ./requirements.txt /requirements.txt
+COPY ./docker/docker-entrypoint.sh /docker-entrypoint.sh
+
+RUN pip install -r requirements.txt
+
+# Install Hugo
+RUN wget https://github.com/gohugoio/hugo/releases/download/v0.102.3/hugo_extended_0.102.3_Linux-64bit.deb -O /tmp/hugo.deb \
+    && dpkg -i /tmp/hugo.deb
+
+WORKDIR /work
+VOLUME [ "/work" ]
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..dfa3de4
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,9 @@
+# Docker build support
+
+To build a container that contains everything required to build and update the website execute the following command.
+
+`docker build . -f docker/Dockerfile -t homie-site:dev`
+
+After that the docker image can be used to build the website in the current directory using something like this.
+
+`docker run --rm -v $PWD:/work homie-site:dev`
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker/docker-entrypoint.sh
similarity index 85%
rename from docker-entrypoint.sh
rename to docker/docker-entrypoint.sh
index 3072f3a..8e1ab48 100755
--- a/docker-entrypoint.sh
+++ b/docker/docker-entrypoint.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 set -Eeo pipefail
 
+cd /work
+
 ./grabrepos.py
 hugo
diff --git a/requirements.txt b/requirements.txt
index 524ff3b..e066983 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,4 +10,3 @@ pymdown-extensions==6.0
 PyYAML==5.3.1
 six==1.11.0
 smmap2==2.0.5
-tornado==5.1.1