updated files and cleaned out extends

gitea/docker-compose.yml

@@ -17,3 +17,4 @@ services:
       - ${VOL_PATH:-./data}/gitea:/data
     ports:
       - "${GITEA_PORT}:22"
+      - "${GITEA_WEB_PORT}:3000"

gitea/sample-extends.yml

@@ -1,12 +0,0 @@
-version: '3.4'
-
-services:
-	gitea:
-		extends:
-			file: ${COOKBOOK}/gitea/docker-compose.yml
-			service: gitea
-		
-	gitea-mariadb:
-		extends:
-			file: ${COOKBOOK}/mariadb/docker-compose.yml
-			service: mariadb

gitea/sample.env

@@ -4,5 +4,6 @@ VOL_PATH=./data #HELP: volpath
 # Gitea
 GITEA_IMAGE=gitea/gitea:latest
 GITEA_DB_HOST=gitea-db:3306
-GITEA_PORT=22
+GITEA_SSH_PORT=22
+GITEA_WEB_PORT=3000
 GITEA_SSH_DOMAIN=example.com

mailhog/README.md

@@ -0,0 +1,14 @@
+# Mailhog
+
+TODO:
+
+```
+ mailhog:
+    image: 'mailhog/mailhog:latest' # https://hub.docker.com/r/mailhog/mailhog
+    ports:
+      - "${SMTP_PORT}:1025"
+      - "8002:8025"
+    volumes:
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"
+```

mariadb/sample-extends.yml

@@ -1,7 +0,0 @@
-services:
-
-  mariadb:
-    extends:
-      file: ${COOKBOOK}/mariadb/docker-compose.yml
-      service: mariadb
-

ollama/sample-extends.yml

@@ -1,12 +0,0 @@
-version: '3.4'
-
-services:
-  ollama:
-    extends:
-      file: ${COOKBOOK}/ollama/docker-compose.yml
-      service: ollama
-
-  webui:
-    extends:
-      file: ${COOKBOOK}/ollama/docker-compose.yml
-      service: webui

ollama/sample.env

@@ -1,2 +1,6 @@
 VOL_PATH=./data
 WEBUI_IMAGE=ghcr.io/open-webui/open-webui:cuda
+
+WEBUI_SECRET_KEY=keyher
+WEBUI_URL=myai.example.com
+USE_CUDA_DOCKER=true

phpcontainer/sample-extends.yml

@@ -1,10 +0,0 @@
-services:
-
-  php-apache:
-    extends:
-      file: ${COOKBOOK}/phpcontainer/docker-compose.yml
-      service: php-apache
-    volumes:
-      - "./project:/data"
-      - "./config/php.ini:/usr/local/etc/php/php.ini"
-      

phpmyadmin/docker-compose.yml

@@ -8,4 +8,6 @@ services:
       - PMA_USER=${PHPMYADMIN_PMA_USER:-root}
       - PMA_PASSWORD=${MARIADB_MARIADB_ROOT_PASSWORD:-ChangeThisPassword}
       - UPLOAD_LIMIT=${PHPMYADMIN_UPLOAD_LIMIT:-200M}  
-      
+    volumes:
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"

phpmyadmin/sample-extends.yml

@@ -1,7 +0,0 @@
-version: '3.4'
-
-services:
-  phpmyadmin:
-    extends:
-      file: ${COOKBOOK}/phpmyadmin/docker-compose.yml
-      service: phpmyadmin

qbittorrent/sample-extends.yml

@@ -1,9 +0,0 @@
-version: '3.4'
-
-services:
-	  qbittorrent:
-      extends:
-        file: ${COOKBOOK}/qbittorrent/docker-compose.yml
-        service: qbittorrent
-      env_file:
-        - .env

shlink/README.md

@@ -0,0 +1,9 @@
+# Shlink
+
+Work in progress.
+
+
+## Gotcha
+
+The web client doesn't have user authentication by default.
+I used nginx proxy manager to block it.

shlink/docker-compose.yml

@@ -1,4 +1,6 @@
- mariadb-shlink:
+services:
+
+  mariadb-shlink:
     image: mariadb:10.7.1 # https://hub.docker.com/_/mariadb
     restart: always
     environment:
@@ -27,6 +29,15 @@
       - DB_PASSWORD=change
       - DB_HOST=mariadb-shlink
       - DEFAULT_BASE_URL_REDIRECT=https://www.domain.ca
-    networks:
-      - 4lt_internal
-      - admin_web
+
+  shlink-web-client:
+    image: shlinkio/shlink-web-client
+    restart: always
+    volumes:
+      - ./shlink/servers.json:/usr/share/nginx/html/servers.json
+    ports:
+      - 8003:80
+
+networks:
+    - 4lt_internal
+    - admin_web