From edb7658b921b1004bd112db36e56bfd95d8e43f9 Mon Sep 17 00:00:00 2001 From: Nick Yeoman Date: Sat, 1 Mar 2025 01:38:07 -0800 Subject: [PATCH] updated files and cleaned out extends --- gitea/docker-compose.yml | 1 + gitea/sample-extends.yml | 12 ------------ gitea/sample.env | 3 ++- mailhog/README.md | 14 ++++++++++++++ mariadb/sample-extends.yml | 7 ------- ollama/sample-extends.yml | 12 ------------ ollama/sample.env | 4 ++++ phpcontainer/sample-extends.yml | 10 ---------- phpmyadmin/docker-compose.yml | 4 +++- phpmyadmin/sample-extends.yml | 7 ------- qbittorrent/sample-extends.yml | 9 --------- shlink/README.md | 9 +++++++++ shlink/docker-compose.yml | 19 +++++++++++++++---- 13 files changed, 48 insertions(+), 63 deletions(-) delete mode 100644 gitea/sample-extends.yml create mode 100644 mailhog/README.md delete mode 100644 mariadb/sample-extends.yml delete mode 100644 ollama/sample-extends.yml delete mode 100644 phpcontainer/sample-extends.yml delete mode 100644 phpmyadmin/sample-extends.yml delete mode 100644 qbittorrent/sample-extends.yml create mode 100644 shlink/README.md diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index c641462..fe44a70 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -17,3 +17,4 @@ services: - ${VOL_PATH:-./data}/gitea:/data ports: - "${GITEA_PORT}:22" + - "${GITEA_WEB_PORT}:3000" diff --git a/gitea/sample-extends.yml b/gitea/sample-extends.yml deleted file mode 100644 index d8962de..0000000 --- a/gitea/sample-extends.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/gitea/sample.env b/gitea/sample.env index 29565ec..59169f7 100644 --- a/gitea/sample.env +++ b/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 \ No newline at end of file diff --git a/mailhog/README.md b/mailhog/README.md new file mode 100644 index 0000000..7901d4d --- /dev/null +++ b/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" +``` \ No newline at end of file diff --git a/mariadb/sample-extends.yml b/mariadb/sample-extends.yml deleted file mode 100644 index 37d65a5..0000000 --- a/mariadb/sample-extends.yml +++ /dev/null @@ -1,7 +0,0 @@ -services: - - mariadb: - extends: - file: ${COOKBOOK}/mariadb/docker-compose.yml - service: mariadb - diff --git a/ollama/sample-extends.yml b/ollama/sample-extends.yml deleted file mode 100644 index d32673b..0000000 --- a/ollama/sample-extends.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/ollama/sample.env b/ollama/sample.env index 0ce0fc2..33d826f 100644 --- a/ollama/sample.env +++ b/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 diff --git a/phpcontainer/sample-extends.yml b/phpcontainer/sample-extends.yml deleted file mode 100644 index f400fa0..0000000 --- a/phpcontainer/sample-extends.yml +++ /dev/null @@ -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" - diff --git a/phpmyadmin/docker-compose.yml b/phpmyadmin/docker-compose.yml index 60c5019..14c9569 100644 --- a/phpmyadmin/docker-compose.yml +++ b/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} - \ No newline at end of file + volumes: + - "/etc/timezone:/etc/timezone:ro" + - "/etc/localtime:/etc/localtime:ro" diff --git a/phpmyadmin/sample-extends.yml b/phpmyadmin/sample-extends.yml deleted file mode 100644 index efa81e2..0000000 --- a/phpmyadmin/sample-extends.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: '3.4' - -services: - phpmyadmin: - extends: - file: ${COOKBOOK}/phpmyadmin/docker-compose.yml - service: phpmyadmin diff --git a/qbittorrent/sample-extends.yml b/qbittorrent/sample-extends.yml deleted file mode 100644 index 9c9bfb0..0000000 --- a/qbittorrent/sample-extends.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: '3.4' - -services: - qbittorrent: - extends: - file: ${COOKBOOK}/qbittorrent/docker-compose.yml - service: qbittorrent - env_file: - - .env \ No newline at end of file diff --git a/shlink/README.md b/shlink/README.md new file mode 100644 index 0000000..2a75b26 --- /dev/null +++ b/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. diff --git a/shlink/docker-compose.yml b/shlink/docker-compose.yml index d0480c0..fae5261 100644 --- a/shlink/docker-compose.yml +++ b/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 \ No newline at end of file + + 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 \ No newline at end of file