From eab02c2aa5de862a2519d5c1a4caab76b5b11f4f Mon Sep 17 00:00:00 2001
From: David Ball <david@daball.me>
Date: Fri, 24 May 2024 05:43:48 -0400
Subject: [PATCH] Added additional Docker Compose examples. Removed defunct
 Caddyfile.

---
 Caddyfile                               | 28 ------------
 docker/README.md                        | 12 +++++
 docker/fullstack/docker-compose.yml     | 59 +++++++++++++++++++++++++
 docker/nm3clol-caddy/docker-compose.yml | 28 ++++++++++++
 docker/nm3clol.Caddyfile                |  9 ++++
 docker/nm3clol.Dockerfile               |  6 +++
 docker/nm3clol/docker-compose.yml       |  8 ++++
 7 files changed, 122 insertions(+), 28 deletions(-)
 delete mode 100644 Caddyfile
 create mode 100644 docker/fullstack/docker-compose.yml
 create mode 100644 docker/nm3clol-caddy/docker-compose.yml
 create mode 100644 docker/nm3clol.Caddyfile
 create mode 100644 docker/nm3clol.Dockerfile
 create mode 100644 docker/nm3clol/docker-compose.yml

diff --git a/Caddyfile b/Caddyfile
deleted file mode 100644
index e26bff50..00000000
--- a/Caddyfile
+++ /dev/null
@@ -1,28 +0,0 @@
-russell-county-archives.daball.me {
-    import /etc/caddy/tls-dns-cloudflare
-    encode gzip
-    redir * https://no-moss-3-carbo-landfill-library.online{uri} permanent
-}
-
-no-moss-3-carbo-landfill-library.online {
-    import /etc/caddy/tls-dns-cloudflare
-
-    encode gzip
-
-    root * /srv/www/no-moss-3-carbo-landfill-library.online
-
-    @node_search path /search*
-    reverse_proxy @node_search localhost:3000
-
-    @ext_html path_regexp ^.*\.(htm|html)$
-    rewrite @ext_html archived.php
-    php_fastcgi unix//var/run/php/php8.2-fpm.sock
-
-    import redirects.Caddyfile
-
-    file_server {
-        root /srv/www/no-moss-3-carbo-landfill-library.online/public
-        index index.nofile
-        browse /srv/www/no-moss-3-carbo-landfill-library.online/browse.html
-   }
-}
diff --git a/docker/README.md b/docker/README.md
index b22b7e6d..85445d78 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,6 +2,18 @@
 
 Here are some Docker Compose configuration examples.
 
+## fullstack
+
+Example fullstack Solr, Tika with Tesseract, Web App, and Reverse Proxy instance.
+
+## nm3clol
+
+Minimal Web App only, no reverse proxy.
+
+## nm3clol-caddy
+
+Web App only with Caddy reverse proxy.
+
 ## solr
 
 Minimal Solr instance.
diff --git a/docker/fullstack/docker-compose.yml b/docker/fullstack/docker-compose.yml
new file mode 100644
index 00000000..d8983909
--- /dev/null
+++ b/docker/fullstack/docker-compose.yml
@@ -0,0 +1,59 @@
+version: "3.8"
+
+services:
+  solr:
+    image: solr:latest
+    container_name: solr
+    restart: unless-stopped
+    ports:
+      - "8983:8983"
+    volumes:
+      - ../solr-data:/var/solr
+#    environment:
+#      - SOLR_CORE=my_core
+    command:
+      - solr-precreate
+#      - gettingstarted
+    user: "1000:995"
+
+  tika:
+    image: apache/tika:latest-full
+    container_name: tika
+    restart: unless-stopped
+    entrypoint: [ "/bin/sh", "-c", "exec java -cp \"/customocr:/tika-server-standard-2.9.2.jar:/tika-extras/*\" org.apache.tika.server.core.TikaServerCli -h 0.0.0.0 $$0 $$@"]
+    environment:
+      - TIKA_LOG_PATH=/tika-logs
+    command: -c /tika-config.xml
+    volumes:
+      - ../tika-config.xml:/tika-config.xml
+      - ../tika-data/logs:/tika-logs
+      - ../tika-data/log4j2.xml:/log4j2.xml
+      - ../TesseractOCRConfig.properties:/TesseractOCRConfig.properties
+    ports:
+      - "9998:9998"
+
+  nm3clol:
+    build: ../nm3clol.Dockerfile
+    container_name: nm3clol
+    ports:
+      - "3000:3000"
+
+  caddy:
+    image: caddy:latest
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - "80:80"
+      - "443:443"
+      - "443:443/udp"
+    volumes:
+      - $PWD/../nm3clol.Caddyfile:/etc/caddy/Caddyfile
+      - $PWD/..:/srv
+      - caddy_data:/data
+      - caddy_config:/config
+
+volumes:
+  caddy_data:
+    external: true
+  caddy_config:
\ No newline at end of file
diff --git a/docker/nm3clol-caddy/docker-compose.yml b/docker/nm3clol-caddy/docker-compose.yml
new file mode 100644
index 00000000..29004e70
--- /dev/null
+++ b/docker/nm3clol-caddy/docker-compose.yml
@@ -0,0 +1,28 @@
+version: "3.8"
+
+services:
+  nm3clol:
+    build: ../nm3clol.Dockerfile
+    container_name: nm3clol
+    ports:
+      - "3000:3000"
+
+  caddy:
+    image: caddy:latest
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - "80:80"
+      - "443:443"
+      - "443:443/udp"
+    volumes:
+      - $PWD/../nm3clol.Caddyfile:/etc/caddy/Caddyfile
+      - $PWD/..:/srv
+      - caddy_data:/data
+      - caddy_config:/config
+
+volumes:
+  caddy_data:
+    external: true
+  caddy_config:
\ No newline at end of file
diff --git a/docker/nm3clol.Caddyfile b/docker/nm3clol.Caddyfile
new file mode 100644
index 00000000..40a1d542
--- /dev/null
+++ b/docker/nm3clol.Caddyfile
@@ -0,0 +1,9 @@
+www.no-moss-3-carbo-landfill-library.online {
+    encode gzip
+    redir * https://no-moss-3-carbo-landfill-library.online{uri} permanent
+}
+
+no-moss-3-carbo-landfill-library.online {
+    encode gzip
+    reverse_proxy localhost:3000
+}
diff --git a/docker/nm3clol.Dockerfile b/docker/nm3clol.Dockerfile
new file mode 100644
index 00000000..6f8fe87a
--- /dev/null
+++ b/docker/nm3clol.Dockerfile
@@ -0,0 +1,6 @@
+FROM node:20.12.2-bookworm
+WORKDIR ..
+RUN npm install
+RUN npm run-script transpile:ts
+EXPOSE 3000
+CMD ["npm", "run-script", "server"]
\ No newline at end of file
diff --git a/docker/nm3clol/docker-compose.yml b/docker/nm3clol/docker-compose.yml
new file mode 100644
index 00000000..aeb6a282
--- /dev/null
+++ b/docker/nm3clol/docker-compose.yml
@@ -0,0 +1,8 @@
+version: "3.8"
+
+services:
+  nm3clol:
+    build: ../nm3clol.Dockerfile
+    container_name: nm3clol
+    ports:
+      - "3000:3000"