From 58abf04d2c50646e3ca38e03d656e5007b3b970c Mon Sep 17 00:00:00 2001
From: Ville Rantanen <q@moonq.org>
Date: Mon, 24 Jul 2023 20:02:45 +0300
Subject: [PATCH] restructure for docker

---
 Makefile                                      |  17 ------
 docker-compose.yml                            |  18 +++++++
 example.env                                   |   7 +++
 forum/Dockerfile                              |  36 +++++++++++++
 captcha.py => forum/captcha.py                |   0
 {db => forum/db}/sqlite.py                    |   0
 forum/docker-builder.sh                       |   7 +++
 forum/docker-entrypoint.sh                    |  50 ++++++++++++++++++
 init_sqlite.sh => forum/init_sqlite.sh        |   0
 main.py => forum/main.py                      |   0
 minimd.py => forum/minimd.py                  |   0
 password.py => forum/password.py              |   0
 requirements.txt => forum/requirements.txt    |   0
 forum/restart.sh                              |  27 ++++++++++
 run_sqlite.sh => forum/run_sqlite.sh          |   0
 schema.txt => forum/schema.txt                |   0
 forum/static/button.png                       | Bin 0 -> 9651 bytes
 {static => forum/static}/theme.css            |   0
 .../templates}/admin/base.html                |   0
 .../templates}/admin/index.html               |   0
 .../templates}/admin/query.html               |   0
 {templates => forum/templates}/base.html      |   0
 {templates => forum/templates}/comment.html   |   0
 {templates => forum/templates}/comments.html  |   0
 .../templates}/confirm_delete_comment.html    |   0
 .../templates}/confirm_delete_thread.html     |   0
 .../templates}/edit_comment.html              |   0
 .../templates}/edit_thread.html               |   0
 {templates => forum/templates}/forum.html     |   0
 {templates => forum/templates}/help.html      |   0
 {templates => forum/templates}/index.html     |   0
 {templates => forum/templates}/login.html     |   0
 {templates => forum/templates}/moderator.html |   0
 .../templates}/new_thread.html                |   0
 {templates => forum/templates}/register.html  |   0
 {templates => forum/templates}/thread.html    |   0
 {templates => forum/templates}/user_edit.html |   0
 {templates => forum/templates}/user_info.html |   0
 {test => forum/test}/all.sh                   |   0
 {test => forum/test}/init_db.txt              |   0
 tool.py => forum/tool.py                      |   0
 {upgrade => forum/upgrade}/sqlite/v0.1.sh     |   0
 upgrade_sqlite.sh => forum/upgrade_sqlite.sh  |   0
 forum/version.py                              |   3 ++
 stop.sh                                       |   4 ++
 45 files changed, 152 insertions(+), 17 deletions(-)
 delete mode 100644 Makefile
 create mode 100644 docker-compose.yml
 create mode 100644 example.env
 create mode 100644 forum/Dockerfile
 rename captcha.py => forum/captcha.py (100%)
 rename {db => forum/db}/sqlite.py (100%)
 create mode 100755 forum/docker-builder.sh
 create mode 100755 forum/docker-entrypoint.sh
 rename init_sqlite.sh => forum/init_sqlite.sh (100%)
 rename main.py => forum/main.py (100%)
 rename minimd.py => forum/minimd.py (100%)
 rename password.py => forum/password.py (100%)
 rename requirements.txt => forum/requirements.txt (100%)
 create mode 100755 forum/restart.sh
 rename run_sqlite.sh => forum/run_sqlite.sh (100%)
 rename schema.txt => forum/schema.txt (100%)
 create mode 100644 forum/static/button.png
 rename {static => forum/static}/theme.css (100%)
 rename {templates => forum/templates}/admin/base.html (100%)
 rename {templates => forum/templates}/admin/index.html (100%)
 rename {templates => forum/templates}/admin/query.html (100%)
 rename {templates => forum/templates}/base.html (100%)
 rename {templates => forum/templates}/comment.html (100%)
 rename {templates => forum/templates}/comments.html (100%)
 rename {templates => forum/templates}/confirm_delete_comment.html (100%)
 rename {templates => forum/templates}/confirm_delete_thread.html (100%)
 rename {templates => forum/templates}/edit_comment.html (100%)
 rename {templates => forum/templates}/edit_thread.html (100%)
 rename {templates => forum/templates}/forum.html (100%)
 rename {templates => forum/templates}/help.html (100%)
 rename {templates => forum/templates}/index.html (100%)
 rename {templates => forum/templates}/login.html (100%)
 rename {templates => forum/templates}/moderator.html (100%)
 rename {templates => forum/templates}/new_thread.html (100%)
 rename {templates => forum/templates}/register.html (100%)
 rename {templates => forum/templates}/thread.html (100%)
 rename {templates => forum/templates}/user_edit.html (100%)
 rename {templates => forum/templates}/user_info.html (100%)
 rename {test => forum/test}/all.sh (100%)
 rename {test => forum/test}/init_db.txt (100%)
 rename tool.py => forum/tool.py (100%)
 rename {upgrade => forum/upgrade}/sqlite/v0.1.sh (100%)
 rename upgrade_sqlite.sh => forum/upgrade_sqlite.sh (100%)
 create mode 100755 forum/version.py
 create mode 100755 stop.sh

diff --git a/Makefile b/Makefile
deleted file mode 100644
index b852cd6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-PYTHON = python3
-FLASK = flask
-SQLITE = sqlite3
-
-default: venv
-
-test: venv
-	test/all.sh
-
-venv:
-	$(PYTHON) -m venv $@
-	. ./venv/bin/activate && pip3 install -r requirements.txt
-
-forum.db:
-	$(SQLITE) $@ < schema.txt
-
-.PHONY: test
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..2230332
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: "3.7"
+
+services:
+  forum:
+    build:
+      context: ./forum/
+      dockerfile: ./Dockerfile
+      args:
+        UID: ${UID}
+        GID: ${GID}
+        TZ: ${TZ}
+    volumes:
+      - "./forum/:/app"
+    ports:
+      - "${EXPOSE}:5000"
+    environment:
+      ADMINU: ${ADMINU}
+      ADMINP: ${ADMINP}
diff --git a/example.env b/example.env
new file mode 100644
index 0000000..7d6239a
--- /dev/null
+++ b/example.env
@@ -0,0 +1,7 @@
+
+UID=1000
+GID=1000
+TZ=Europe/Helsinki
+ADMINU=admin
+ADMINP=admin
+EXPOSE=5000
diff --git a/forum/Dockerfile b/forum/Dockerfile
new file mode 100644
index 0000000..531f94b
--- /dev/null
+++ b/forum/Dockerfile
@@ -0,0 +1,36 @@
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update -yqq \
+    && apt-get install -y --no-install-recommends \
+               sqlite3 \
+               tzdata \
+               git \
+               make \
+               python3-venv \
+               python3-pip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG UID
+ARG GID
+ARG TZ
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN groupadd -g $GID user && \
+    useradd -u $UID -g $GID -ms /bin/bash user && \
+    mkdir -p /opt/venv && chown $UID:$GID /opt/venv
+COPY ./requirements.txt /requirements.txt
+COPY docker-builder.sh /
+USER user
+
+RUN bash /docker-builder.sh
+#COPY ./ /app
+#USER root
+#RUN chown -R $UID:$GID /app
+USER user
+
+WORKDIR /app
+
+COPY docker-entrypoint.sh /
+CMD bash /docker-entrypoint.sh
diff --git a/captcha.py b/forum/captcha.py
similarity index 100%
rename from captcha.py
rename to forum/captcha.py
diff --git a/db/sqlite.py b/forum/db/sqlite.py
similarity index 100%
rename from db/sqlite.py
rename to forum/db/sqlite.py
diff --git a/forum/docker-builder.sh b/forum/docker-builder.sh
new file mode 100755
index 0000000..dd54adc
--- /dev/null
+++ b/forum/docker-builder.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eux
+
+python3 -m venv /opt/venv
+. /opt/venv/bin/activate
+pip3 install -r requirements.txt
diff --git a/forum/docker-entrypoint.sh b/forum/docker-entrypoint.sh
new file mode 100755
index 0000000..67e8a8a
--- /dev/null
+++ b/forum/docker-entrypoint.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+PYTHON=python3
+SQLITE=sqlite3
+
+export DB="/app/forum.db"
+export SERVER=gunicorn
+export PID="forum.pid"
+export WORKERS=4
+
+if [[ $( stat -c %u /app ) -ne $( id -u ) ]]; then
+  echo User id and /app folder owner do not match
+  printf 'UID: %s\nFolder: %s\n' $( id -u ) $( stat -c %u /app )
+  exit 1
+fi
+
+set -eu
+. /opt/venv/bin/activate
+if [[ -e "$DB" ]]; then
+  $SQLITE -header "$DB" "SELECT version,name,description,registration_enabled,login_required FROM config"
+  echo Database already exists
+else
+  password=$($PYTHON tool.py password "$ADMINP")
+  time=$($PYTHON -c 'import time; print(time.time_ns())')
+  version=$($PYTHON tool.py version)
+
+  $SQLITE "$DB" -init schema.txt "insert into config (
+	version,
+	name,
+	description,
+	secret_key,
+	captcha_key,
+	registration_enabled,
+    login_required
+)
+values (
+	'$version',
+	'Forum',
+	'',
+	'$(head -c 30 /dev/urandom | base64)',
+	'$(head -c 30 /dev/urandom | base64)',
+	0,
+    1
+  )"
+  $SQLITE "$DB" "
+	insert into users (name, password, role, join_time)
+	values (lower('$ADMINU'), '$password', 2, $time)
+  "
+fi
+
+exec "$SERVER" -w $WORKERS 'main:app' --pid="$PID" -b 0.0.0.0:5000
diff --git a/init_sqlite.sh b/forum/init_sqlite.sh
similarity index 100%
rename from init_sqlite.sh
rename to forum/init_sqlite.sh
diff --git a/main.py b/forum/main.py
similarity index 100%
rename from main.py
rename to forum/main.py
diff --git a/minimd.py b/forum/minimd.py
similarity index 100%
rename from minimd.py
rename to forum/minimd.py
diff --git a/password.py b/forum/password.py
similarity index 100%
rename from password.py
rename to forum/password.py
diff --git a/requirements.txt b/forum/requirements.txt
similarity index 100%
rename from requirements.txt
rename to forum/requirements.txt
diff --git a/forum/restart.sh b/forum/restart.sh
new file mode 100755
index 0000000..a1997c7
--- /dev/null
+++ b/forum/restart.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+SERVER="$1"
+if [ -z "$SERVER" ]
+then
+	echo "SERVER is not set" >&2
+	exit 1
+fi
+
+case "$SERVER" in
+	dev)
+		touch main.py
+		;;
+	gunicorn)
+		if [ -z "$PID" ]
+		then
+			echo "PID is not set" >&2
+			exit 1
+		fi
+		kill -hup $(cat "$PID")
+		;;
+	*)
+		echo "Unsupported $SERVER" >&2
+		exit 1
+		;;
+esac
diff --git a/run_sqlite.sh b/forum/run_sqlite.sh
similarity index 100%
rename from run_sqlite.sh
rename to forum/run_sqlite.sh
diff --git a/schema.txt b/forum/schema.txt
similarity index 100%
rename from schema.txt
rename to forum/schema.txt
diff --git a/forum/static/button.png b/forum/static/button.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d49088e53206ac60385db2dc09221f4c7a735aa
GIT binary patch
literal 9651
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

literal 0
HcmV?d00001

diff --git a/static/theme.css b/forum/static/theme.css
similarity index 100%
rename from static/theme.css
rename to forum/static/theme.css
diff --git a/templates/admin/base.html b/forum/templates/admin/base.html
similarity index 100%
rename from templates/admin/base.html
rename to forum/templates/admin/base.html
diff --git a/templates/admin/index.html b/forum/templates/admin/index.html
similarity index 100%
rename from templates/admin/index.html
rename to forum/templates/admin/index.html
diff --git a/templates/admin/query.html b/forum/templates/admin/query.html
similarity index 100%
rename from templates/admin/query.html
rename to forum/templates/admin/query.html
diff --git a/templates/base.html b/forum/templates/base.html
similarity index 100%
rename from templates/base.html
rename to forum/templates/base.html
diff --git a/templates/comment.html b/forum/templates/comment.html
similarity index 100%
rename from templates/comment.html
rename to forum/templates/comment.html
diff --git a/templates/comments.html b/forum/templates/comments.html
similarity index 100%
rename from templates/comments.html
rename to forum/templates/comments.html
diff --git a/templates/confirm_delete_comment.html b/forum/templates/confirm_delete_comment.html
similarity index 100%
rename from templates/confirm_delete_comment.html
rename to forum/templates/confirm_delete_comment.html
diff --git a/templates/confirm_delete_thread.html b/forum/templates/confirm_delete_thread.html
similarity index 100%
rename from templates/confirm_delete_thread.html
rename to forum/templates/confirm_delete_thread.html
diff --git a/templates/edit_comment.html b/forum/templates/edit_comment.html
similarity index 100%
rename from templates/edit_comment.html
rename to forum/templates/edit_comment.html
diff --git a/templates/edit_thread.html b/forum/templates/edit_thread.html
similarity index 100%
rename from templates/edit_thread.html
rename to forum/templates/edit_thread.html
diff --git a/templates/forum.html b/forum/templates/forum.html
similarity index 100%
rename from templates/forum.html
rename to forum/templates/forum.html
diff --git a/templates/help.html b/forum/templates/help.html
similarity index 100%
rename from templates/help.html
rename to forum/templates/help.html
diff --git a/templates/index.html b/forum/templates/index.html
similarity index 100%
rename from templates/index.html
rename to forum/templates/index.html
diff --git a/templates/login.html b/forum/templates/login.html
similarity index 100%
rename from templates/login.html
rename to forum/templates/login.html
diff --git a/templates/moderator.html b/forum/templates/moderator.html
similarity index 100%
rename from templates/moderator.html
rename to forum/templates/moderator.html
diff --git a/templates/new_thread.html b/forum/templates/new_thread.html
similarity index 100%
rename from templates/new_thread.html
rename to forum/templates/new_thread.html
diff --git a/templates/register.html b/forum/templates/register.html
similarity index 100%
rename from templates/register.html
rename to forum/templates/register.html
diff --git a/templates/thread.html b/forum/templates/thread.html
similarity index 100%
rename from templates/thread.html
rename to forum/templates/thread.html
diff --git a/templates/user_edit.html b/forum/templates/user_edit.html
similarity index 100%
rename from templates/user_edit.html
rename to forum/templates/user_edit.html
diff --git a/templates/user_info.html b/forum/templates/user_info.html
similarity index 100%
rename from templates/user_info.html
rename to forum/templates/user_info.html
diff --git a/test/all.sh b/forum/test/all.sh
similarity index 100%
rename from test/all.sh
rename to forum/test/all.sh
diff --git a/test/init_db.txt b/forum/test/init_db.txt
similarity index 100%
rename from test/init_db.txt
rename to forum/test/init_db.txt
diff --git a/tool.py b/forum/tool.py
similarity index 100%
rename from tool.py
rename to forum/tool.py
diff --git a/upgrade/sqlite/v0.1.sh b/forum/upgrade/sqlite/v0.1.sh
similarity index 100%
rename from upgrade/sqlite/v0.1.sh
rename to forum/upgrade/sqlite/v0.1.sh
diff --git a/upgrade_sqlite.sh b/forum/upgrade_sqlite.sh
similarity index 100%
rename from upgrade_sqlite.sh
rename to forum/upgrade_sqlite.sh
diff --git a/forum/version.py b/forum/version.py
new file mode 100755
index 0000000..c87fc89
--- /dev/null
+++ b/forum/version.py
@@ -0,0 +1,3 @@
+
+VERSION = "agreper-v0.1.1q1"
+
diff --git a/stop.sh b/stop.sh
new file mode 100755
index 0000000..bdb6029
--- /dev/null
+++ b/stop.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+docker-compose down forum