fixed a bunch of variables and modified the Gitea compose a lot

Dockhand/.env.example

@@ -1,3 +1,6 @@
+# Docker image tag for fnsys/dockhand (e.g. "1.2.3" or "latest"); defaults to latest if unset
+DOCKHAND_VERSION="latest"
+
 # Main interface port for accessing the application
 DOCKHAND_PORT="3000"
 

Dockhand/docker-compose-volume.yaml

@@ -1,16 +1,16 @@
 services:
   app:
-    image: fnsys/dockhand:latest
+    image: fnsys/dockhand:${DOCKHAND_VERSION:-latest}
     container_name: dockhand
     ports:
-      - "${DOCKHAND_PORT}:3000"
+      - "${DOCKHAND_PORT:-3000}:3000"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - dockhand_data:/app/data
     environment:
-      - PUID=${DOCKHAND_PUID}
+      - PUID=${DOCKHAND_PUID:-1000}
-      - PGID=${DOCKHAND_PGID}
+      - PGID=${DOCKHAND_PGID:-1000}
-      - TZ=${DOCKHAND_TZ}
+      - TZ=${DOCKHAND_TZ:-America/Los_Angeles}
     deploy:
       resources:
         limits:

Doku/.env.example

@@ -1,2 +1,5 @@
+# Docker image tag for amerkurev/doku (e.g. "1.2.3" or "latest"); defaults to latest if unset
+DOKU_VERSION="latest"
+
 # Main interface port for accessing the application
-DOKU_PORT="8000"
+DOKU_PORT="9090"

Doku/docker-compose.yaml

@@ -1,12 +1,12 @@
 services:
   app:
-    image: amerkurev/doku:latest
+    image: amerkurev/doku:${DOKU_VERSION:-latest}
     container_name: doku
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /:/hostroot:ro
     ports:
-      - ${DOKU_PORT}:9090
+      - ${DOKU_PORT:-9090}:9090
     deploy:
       resources:
         limits:

Draw.io/.env.example

@@ -1,5 +1,8 @@
+# Docker image tag for jgraph/drawio (e.g. "24.0.0" or "latest"); defaults to latest if unset
+DRAWIO_VERSION="latest"
+
 # Main interface port for accessing the application
-DRAWIO_PORT="8000"
+DRAWIO_PORT="8080"
 
 # Enable local PDF/image export without relying on an external service
 # Set to 1 to enable, 0 or omit to disable

Draw.io/docker-compose.yaml

@@ -1,9 +1,9 @@
 services:
   app:
-    image: jgraph/drawio:latest
+    image: jgraph/drawio:${DRAWIO_VERSION:-latest}
     container_name: drawio
     ports:
-      - ${DRAWIO_PORT}:8080
+      - ${DRAWIO_PORT:-8080}:8080
     environment:
       - DRAWIO_SELF_CONTAINED=${DRAWIO_SELF_CONTAINED:-0}
     healthcheck:

Gitea/.env.example

@@ -1,7 +1,10 @@
-# Specifiy the type of database server you are using so Gitea knows (leave default mysql for this docker compose setup)
+# Docker image tag for gitea/gitea (e.g. "1.22.0" or "latest"); defaults to latest if unset
-GITEA_database_DB_TYPE="mysql"
+GITEA_VERSION="latest"
 
-# Port that the database server allows connection between the app server and the database server (leave default 3306)
+# Linux username on the host whose home directory is used for the data bind mount (/home/<username>/gitea/data)
+GITEA_USERNAME="gitea"
+
+# Port that the database server allows connections on (leave default 3306)
 GITEA_database_HOST="3306"
 
 # Database name that the app server will create after connecting to the database server
@@ -13,11 +16,11 @@ GITEA_database_USER="gitea"
 # Password for the database username that the app server will use to connect to the database server
 GITEA_database_PASSWD="changeme"
 
+# Password for the root user on the database server; set it to something strong, you won't need it regularly
+GITEA_database_ROOT_PASSWD="changeme"
+
 # Main interface port for accessing the application
-GITEA_PORT="8000"
+GITEA_PORT="3000"
 
-# SSH port you can expose for some applciations to connect instead of HTTPS
+# SSH port exposed for Git over SSH connections
-SSH_PORT="2222"
+GITEA_SSH_PORT="2222"
-
-# Password for the Root user on the database server.  You won't have to use this so just set it to something strong
-GITEA_database_ROOT_PASSWD="changeme"

Gitea/docker-compose.yaml

@@ -1,36 +1,56 @@
 services:
   app:
-    image: gitea/gitea:latest
+    image: gitea/gitea:${GITEA_VERSION:-latest}
+    container_name: gitea-app
     environment:
-      - GITEA__database__DB_TYPE=${GITEA_database_DB_TYPE}
+      - GITEA__database__DB_TYPE=mysql
-      - GITEA__database__HOST=db:${GITEA_database_HOST}
+      - GITEA__database__HOST=db:${GITEA_database_HOST:-3306}
-      - GITEA__database__NAME=${GITEA_database_NAME}
+      - GITEA__database__NAME=${GITEA_database_NAME:-gitea}
-      - GITEA__database__USER=${GITEA_database_USER}
+      - GITEA__database__USER=${GITEA_database_USER:-gitea}
-      - GITEA__database__PASSWD=${GITEA_database_PASSWD}
+      - GITEA__database__PASSWD=${GITEA_database_PASSWD:-changeme}
-    restart: unless-stopped
     volumes:
-      - app_data:/data
+      - /home/${GITEA_USERNAME:-gitea}/gitea/data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - ${GITEA_PORT}:3000
+      - ${GITEA_PORT:-3000}:3000
-      - ${SSH_PORT}:2222
+      - ${GITEA_SSH_PORT:-2222}:2222
     depends_on:
-      - db
+      db:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
+    deploy:
+      resources:
+        limits:
+          memory: 512m
+    restart: unless-stopped
 
   db:
     image: docker.io/library/mysql:8
-    restart: unless-stopped
+    container_name: gitea-db
     environment:
-      - MYSQL_ROOT_PASSWORD=${GITEA_database_ROOT_PASSWD}
+      - MYSQL_ROOT_PASSWORD=${GITEA_database_ROOT_PASSWD:-changeme}
-      - MYSQL_USER=${GITEA_database_USER}
+      - MYSQL_DATABASE=${GITEA_database_NAME:-gitea}
-      - MYSQL_PASSWORD=${GITEA_database_PASSWD}
+      - MYSQL_USER=${GITEA_database_USER:-gitea}
-      - MYSQL_DATABASE=${GITEA_database_NAME}
+      - MYSQL_PASSWORD=${GITEA_database_PASSWD:-changeme}
     volumes:
-      - mysql_data:/var/lib/mysql
+      - gitea_db:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${GITEA_database_ROOT_PASSWD:-changeme}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    deploy:
+      resources:
+        limits:
+          memory: 512m
+    restart: unless-stopped
 
 volumes:
-  app_data:
+  gitea_db:
-    external: false
-  mysql_data:
-    external: false