From eaec704b19d1c83722a90dfe33579cf6917d6900 Mon Sep 17 00:00:00 2001 From: geezo Date: Thu, 20 Mar 2025 00:06:35 +0000 Subject: [PATCH] chnages --- cup/docker-compose.yml | 12 +++++ dozzle/docker-compose.yml | 1 + glance/config/glance.yml | 83 +++++++++++++++++++++++++++++-- glance/docker-compose.yml | 3 ++ gomft/docker-compose.yml | 15 ++++++ gpt-researcher/docker-compose.yml | 69 +++++++++++++++++++++++++ memos/docker-compose.yml | 12 +++++ newt/docker-compose.yml | 9 ++++ tubearchivist/docker-compose.yml | 57 ++++++++++++++------- watchtower/docker-compose.yml | 2 +- yams/docker-compose.yml | 26 +++++----- 11 files changed, 251 insertions(+), 38 deletions(-) create mode 100644 cup/docker-compose.yml create mode 100644 gomft/docker-compose.yml create mode 100644 gpt-researcher/docker-compose.yml create mode 100644 memos/docker-compose.yml diff --git a/cup/docker-compose.yml b/cup/docker-compose.yml new file mode 100644 index 0000000..a046d44 --- /dev/null +++ b/cup/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.8' + +services: + cup: + container_name: cup + image: ghcr.io/sergi0g/cup + command: serve -p 9000 + ports: + - "1024:9000" + volumes: + - /var/run/docker.sock:/var/run/docker.sock + restart: unless-stopped diff --git a/dozzle/docker-compose.yml b/dozzle/docker-compose.yml index 6d37481..5c175c9 100644 --- a/dozzle/docker-compose.yml +++ b/dozzle/docker-compose.yml @@ -12,4 +12,5 @@ services: glance.url: https://dozzle.theocorp glance.description: Container Logs glance.hide: false + restart: unless-stopped \ No newline at end of file diff --git a/glance/config/glance.yml b/glance/config/glance.yml index 06195b4..0576c40 100644 --- a/glance/config/glance.yml +++ b/glance/config/glance.yml @@ -13,7 +13,7 @@ pages: widgets: - type: search autofocus: true - + - type: docker-containers hide-by-default: true @@ -59,13 +59,33 @@ pages: - hoarder-app/hoarder - glanceapp/glance - usememos/memos - - aesameailabs/csm - - type: hacker-news - limit: 15 - collapse-after: 5 + - SesameAILabs/csm + + - type: custom-api + title: Images + cache: 12h + url: http://cup:9000/api/v3/json + template: | + - size: full widgets: + - type: hacker-news + limit: 15 + collapse-after: 5 - type: videos title: Home Automation channels: @@ -81,11 +101,21 @@ pages: - type: reddit subreddit: localllama show-thumbnails: true + - type: reddit + subreddit: n8n + show-thumbnails: true + - type: reddit + subreddit: homeautomation + show-thumbnails: true + - type: reddit + subreddit: homeassistant + show-thumbnails: true - type: videos title: Tech Reviews channels: - UCBJycsmduvYEL83R_U4JriQ # MKBHD + - type: group widgets: @@ -95,6 +125,9 @@ pages: - type: reddit subreddit: chatgpt show-thumbnails: true + - type: reddit + subreddit: obsidianmd + show-thumbnails: true - name: PopCulture columns: @@ -117,6 +150,15 @@ pages: - type: reddit subreddit: kendricklamar show-thumbnails: true + - type: reddit + subreddit: florenceandthemachine + show-thumbnails: true + - type: reddit + subreddit: asoiaf + show-thumbnails: true + - type: reddit + subreddit: truefilm + show-thumbnails: true - type: videos title: Comedy @@ -173,6 +215,13 @@ pages: - UCsy9I56PY3IngCf_VGjunMQ # Zeihan - UCC3ehuUksTyQ7bbjGntmx3Q # Perun + - type: group + title: Geopolitics + widgets: + - type: reddit + subreddit: geopolitics + show-thumbnails: true + - name: Wealth columns: - size: full @@ -184,3 +233,27 @@ pages: subreddit: realestateinvesting limit: 20 sort-by: top + - type: reddit + subreddit: personalfinance + show-thumbnails: true + - type: reddit + subreddit: pslf + show-thumbnails: true + + - name: Reddit Misc + columns: + - size: full + widgets: + - type: group + title: General Reddit + widgets: + - type: reddit + subreddit: travel + show-thumbnails: true + - type: reddit + subreddit: casualconversation + show-thumbnails: true + - type: reddit + subreddit: atlanta + show-thumbnails: true + - type: diff --git a/glance/docker-compose.yml b/glance/docker-compose.yml index 09466cf..c9b42ea 100644 --- a/glance/docker-compose.yml +++ b/glance/docker-compose.yml @@ -12,6 +12,9 @@ services: restart: unless-stopped networks: - default + - cup_default networks: default: + cup_default: + external: true diff --git a/gomft/docker-compose.yml b/gomft/docker-compose.yml new file mode 100644 index 0000000..1189616 --- /dev/null +++ b/gomft/docker-compose.yml @@ -0,0 +1,15 @@ +services: + gomft: + image: starfleetcptn/gomft:latest + container_name: gomft + restart: unless-stopped + ports: + - "1023:8080" + volumes: + - ./data:/app/data + - /home/geezo/nfs_shares/docker_volume_backups:/app/data/gomft/backups + - /home/geezo/test_source_folder:/test + - /var/lib/docker/volumes:p + privileged: true + environment: + - TZ=UTC \ No newline at end of file diff --git a/gpt-researcher/docker-compose.yml b/gpt-researcher/docker-compose.yml new file mode 100644 index 0000000..1be85e0 --- /dev/null +++ b/gpt-researcher/docker-compose.yml @@ -0,0 +1,69 @@ +services: + gpt-researcher: + pull_policy: build + image: gptresearcher/gpt-researcher + build: ./ + environment: + OPENAI_API_KEY: ${OPENAI_API_KEY} + TAVILY_API_KEY: ${TAVILY_API_KEY} + LANGCHAIN_API_KEY: ${LANGCHAIN_API_KEY} + LOGGING_LEVEL: INFO + volumes: + - ${PWD}/my-docs:/usr/src/app/my-docs:rw + - ${PWD}/outputs:/usr/src/app/outputs:rw + - ${PWD}/logs:/usr/src/app/logs:rw + user: root + restart: always + ports: + - 8000:8000 + + gptr-nextjs: + pull_policy: build + image: gptresearcher/gptr-nextjs + stdin_open: true + environment: + CHOKIDAR_USEPOLLING: "true" + LOGGING_LEVEL: INFO + NEXT_PUBLIC_GA_MEASUREMENT_ID: ${NEXT_PUBLIC_GA_MEASUREMENT_ID} + NEXT_PUBLIC_GPTR_API_URL: ${NEXT_PUBLIC_GPTR_API_URL} + build: + dockerfile: Dockerfile.dev + context: frontend/nextjs + volumes: + - /app/node_modules + - ./frontend/nextjs:/app + - ./outputs:/app/outputs + restart: always + ports: + - 3000:3000 + + gpt-researcher-tests: + image: gptresearcher/gpt-researcher-tests + build: ./ + environment: + OPENAI_API_KEY: ${OPENAI_API_KEY} + TAVILY_API_KEY: ${TAVILY_API_KEY} + LANGCHAIN_API_KEY: ${LANGCHAIN_API_KEY} + LOGGING_LEVEL: INFO + profiles: ["test"] + command: > + /bin/sh -c " + pip install pytest pytest-asyncio faiss-cpu && + python -m pytest tests/report-types.py && + python -m pytest tests/vector-store.py + " + + discord-bot: + build: + context: ./docs/discord-bot + dockerfile: Dockerfile.dev + environment: + - DISCORD_BOT_TOKEN=${DISCORD_BOT_TOKEN} + - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID} + volumes: + - ./docs/discord-bot:/app + - /app/node_modules + ports: + - 3001:3000 + profiles: ["discord"] + restart: always \ No newline at end of file diff --git a/memos/docker-compose.yml b/memos/docker-compose.yml new file mode 100644 index 0000000..df46d37 --- /dev/null +++ b/memos/docker-compose.yml @@ -0,0 +1,12 @@ +services: + memos: + image: neosmemo/memos:stable + container_name: memos + volumes: + - memos_data:/var/opt/memos + ports: + - 1022:5230 + restart: unless-stopped + +volumes: + memos_data: diff --git a/newt/docker-compose.yml b/newt/docker-compose.yml index cf78c3f..3d745d5 100644 --- a/newt/docker-compose.yml +++ b/newt/docker-compose.yml @@ -13,6 +13,9 @@ services: - glance_default - hoarder_default - nextcloud_default + - yams_default + - immich_default + - vaultwarden_default extra_hosts: - "pangolin.geezo.site:44.210.184.15" @@ -27,4 +30,10 @@ networks: hoarder_default: external: true nextcloud_default: + external: true + yams_default: + external: true + immich_default: + external: true + vaultwarden_default: external: true \ No newline at end of file diff --git a/tubearchivist/docker-compose.yml b/tubearchivist/docker-compose.yml index e89a8fc..2855156 100644 --- a/tubearchivist/docker-compose.yml +++ b/tubearchivist/docker-compose.yml @@ -1,26 +1,28 @@ +version: '3' + services: tubearchivist: container_name: tubearchivist restart: unless-stopped - image: bbilly1/tubearchivist + image: bbilly1/tubearchivist:v0.5.0 ports: - - 1021:9000 + - "1021:9000" volumes: - /home/geezo/nfs_shares/media/youtube:/youtube - cache:/cache environment: - - ES_URL=http://archivist-es:9200 # needs protocol e.g. http and port - - REDIS_HOST=archivist-redis # don't add protocol - - HOST_UID=1000 - - HOST_GID=1000 - - TA_HOST=http://theocorp:1021 # set your host name - - TA_USERNAME=geezo # your initial TA credentials - - TA_PASSWORD=verysecret # your initial TA credentials - - ELASTIC_PASSWORD=verysecret # set password for Elasticsearch - - TZ=America/New_York # set your time zone - - TA_PORT=9000 # had to change this because gluetun has a port collision + ES_URL: http://archivist-es:9200 + HOST_UID: 1000 + HOST_GID: 1000 + TA_HOST: http://theocorp:1021 + TA_USERNAME: geezo + TA_PASSWORD: verysecret + ELASTIC_PASSWORD: verysecret + TZ: America/New_York + TA_PORT: 9000 + REDIS_CON: redis://archivist-redis:6379 healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:8000/health" ] + test: ["CMD", "curl", "-f", "http://localhost:8000/health"] interval: 2m timeout: 10s retries: 3 @@ -42,16 +44,17 @@ services: - redis:/data depends_on: - archivist-es + archivist-es: image: bbilly1/tubearchivist-es # only for amd64, or use official es 8.16.0 container_name: archivist-es restart: unless-stopped environment: - - "ELASTIC_PASSWORD=verysecret" # matching Elasticsearch password - - "ES_JAVA_OPTS=-Xms1g -Xmx1g" - - "xpack.security.enabled=true" - - "discovery.type=single-node" - - "path.repo=/usr/share/elasticsearch/data/snapshot" + ELASTIC_PASSWORD: verysecret + ES_JAVA_OPTS: -Xms1g -Xmx1g + xpack.security.enabled: true + discovery.type: single-node + path.repo: /usr/share/elasticsearch/data/snapshot ulimits: memlock: soft: -1 @@ -70,4 +73,20 @@ networks: yams_default: external: true default: - + expose: + - "9200" + +volumes: + cache: + redis: + es: + +networks: + yams_default: + external: true + default: + + + + + diff --git a/watchtower/docker-compose.yml b/watchtower/docker-compose.yml index fdf4126..13c3654 100644 --- a/watchtower/docker-compose.yml +++ b/watchtower/docker-compose.yml @@ -5,6 +5,6 @@ services: image: containrrr/watchtower command: - --cleanup=true - restart: always + restart: unless-stopped volumes: - /var/run/docker.sock:/var/run/docker.sock \ No newline at end of file diff --git a/yams/docker-compose.yml b/yams/docker-compose.yml index b27a50b..78bb011 100644 --- a/yams/docker-compose.yml +++ b/yams/docker-compose.yml @@ -87,19 +87,19 @@ services: # Lidarr is used to query, add downloads to the download queue and index Music # https://lidarr.audio/ - # lidarr: - # image: lscr.io/linuxserver/lidarr - # container_name: lidarr - # environment: - # - PUID=${PUID} - # - PGID=${PGID} - # volumes: - # - /etc/localtime:/etc/localtime:ro - # - ${MEDIA_DIRECTORY}:/data - # - ${INSTALL_DIRECTORY}/config/lidarr:/config - # ports: - # - 2006:8686 - # restart: unless-stopped + lidarr: + image: lscr.io/linuxserver/lidarr + container_name: lidarr + environment: + - PUID=${PUID} + - PGID=${PGID} + volumes: + - /etc/localtime:/etc/localtime:ro + - ${MEDIA_DIRECTORY}:/data + - ${INSTALL_DIRECTORY}/config/lidarr:/config + ports: + - 2006:8686 + restart: unless-stopped # Readarr is used to query, add downloads to the download queue and index Audio and Ebooks # https://readarr.com/