fix remaining non-_dev stacks: bookstack, gitea, heimdall, invokeai, n8n, nextcloud, opencode, paperless, pihole, qbittorrent, stash

gitea/compose.yaml

@@ -1,12 +1,9 @@
-# Gitea
-
 services:
-
   gitea:
-    image: ${GITEA_IMAGE}
+    image: ${GITEA_IMAGE:-gitea/gitea:latest}
     restart: ${GITEA_RESTART:-always}
     volumes:
-      - ${VOL_PATH}/gitea/gitea:/data
+      - ${VOL_PATH}/gitea/data:/data
     environment:
       - USER_UID=1000
       - USER_GID=1000
@@ -22,32 +19,29 @@ services:
       - GITEA__server__SSH_PORT=${GITEA_SSH_PORT:-22}
       - ENABLE_SWAGGER=true
       - MAX_RESPONSE_ITEMS=15
-      
     ports:
-      - ${GITEA_HOST_SSH_PORT:-22}:${GITEA_SSH_PORT:-22}
-      - ${GITEA_WEB_PORT:-3000}:3000
+      - ${GITEA_SSH_PORT:-22}:22
+      - ${GITEA_PORT:-3000}:3000
     networks:
       - proxy
-      - db
+      - internal
     depends_on:
       - gitea-db
 
   gitea-db:
-    image: ${MARIA_IMAGE:-mariadb:latest}
-    restart: ${GITEA_RESTART:-always}
+    image: ${MARIADB_IMAGE:-mariadb:latest}
+    restart: ${MARIADB_RESTART:-unless-stopped}
     volumes:
-      - ${VOL_PATH}/gitea/gitea-db:/var/lib/mysql
+      - ${VOL_PATH}/gitea/db:/var/lib/mysql
     environment:
-      MYSQL_ROOT_PASSWORD: ${MARIA_ROOT:-changeMe}
-      MYSQL_USER: ${GITEA_DB_USER:-gitea}
-      MYSQL_PASSWORD: ${GITEA_DB_PASS:-changeMe}
-      MYSQL_DATABASE: ${GITEA_DB_NAME:-gitea}
-      TZ: ${TZ:-America/Vancouver}
+      - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:-changeMe}
+      - MARIADB_USER=${GITEA_DB_USER:-gitea}
+      - MARIADB_PASSWORD=${GITEA_DB_PASS:-changeMe}
+      - MARIADB_DATABASE=${GITEA_DB_NAME:-gitea}
     networks:
-      - db
+      - internal
 
 networks:
   proxy:
     external: true
-  db:
-    driver: bridge
+  internal:

gitea/sample.env

@@ -1,20 +1,19 @@
+# Compose
 VOL_PATH=/data
+GITEA_IMAGE=gitea/gitea:latest
+GITEA_RESTART=always
+GITEA_PORT=3000
+GITEA_SSH_PORT=22
+MARIADB_IMAGE=mariadb:latest
+MARIADB_RESTART=unless-stopped
+MARIADB_ROOT_PASSWORD=changeMe
 
 # Gitea
-GITEA_IMAGE=gitea/gitea:latest
 GITEA_DB_HOST=gitea-db:3306
 GITEA_DB_PASS=changeMe
 GITEA_DB_NAME=gitea
 GITEA_DB_USER=gitea
 GITEA_SSH_DOMAIN=git.example.com
-GITEA_SSH_PORT=22
-GITEA_HOST_SSH_PORT=22
-GITEA_WEB_PORT=3000
-GITEA_RESTART=always
 GITEA_ROOT_URL=https://git.example.com/
 GITEA_DOMAIN=git.example.com
-
-# MariaDB
 TZ=America/Vancouver
-MARIA_IMAGE=mariadb:latest
-MARIA_ROOT=changeMe