Compare commits

...
6 Commits
7 changed files with 138 additions and 163 deletions

No files matched your search

+8 -4
View File
@@ -63,6 +63,9 @@ networks:
matrix:
external: false
enable_ipv6: true
mealie:
external: false
enable_ipv6: true
sage:
external: false
enable_ipv6: true
@@ -77,6 +80,7 @@ services:
volumes:
- ./nginx:/etc/nginx:ro
- /data/site:/data/site:ro
- /data/webdav:/data/webdav:rw
- nginx:/var/cache/nginx/
networks:
- karakeep
@@ -91,6 +95,7 @@ services:
- matrix
- immich
- sage
- mealie
depends_on:
- jellyfin
- ollama-webui
@@ -103,9 +108,7 @@ services:
- authentik
- matrix-server
- jackett
- sage-static
- sage-api
- sage-pushpin
- mealie
logging: &logging
options:
max-size: "50m"
@@ -266,6 +269,8 @@ services:
ports:
- 127.0.0.1:25:25
bitwarden:
image: vaultwarden/server:1.37.0
# image: vaultwarden/server:latest
# env_file:
# - bitwarden.env
environment:
@@ -278,7 +283,6 @@ services:
networks:
- bitwarden
- mail
image: vaultwarden/server:latest
restart: always
volumes:
- /data/bitwarden:/data
+2 -2
View File
@@ -180,8 +180,8 @@ services:
restart: unless-stopped
group_add:
- '993'
devices:
- /dev/dri/renderD128:/dev/dri/renderD128
# devices:
# - /dev/dri/renderD128:/dev/dri/renderD128
# runtime: nvidia
# deploy:
# resources:
+42 -13
View File
@@ -14,7 +14,8 @@ services:
- /data/secrets/karakeep
environment:
MEILI_ADDR: http://meilisearch:7700
BROWSER_WEB_URL: http://karakeep-chrome:9222
# BROWSER_WEB_URL: http://karakeep-chrome:9222
BROWSER_WEB_URL: http://karakeep-chrome:3000
OLLAMA_BASE_URL: http://ollama:11434 #comma separated ollama hosts
INFERENCE_TEXT_MODEL: gemma3
INFERENCE_IMAGE_MODEL: llava
@@ -32,19 +33,47 @@ services:
- karakeep-int
- ollama-int
karakeep-chrome:
image: gcr.io/zenika-hub/alpine-chrome:123
image: browserless/chrome:latest
restart: unless-stopped
command:
- --no-sandbox
- --disable-gpu
- --disable-dev-shm-usage
- --remote-debugging-address=0.0.0.0
- --remote-debugging-port=9222
- --hide-scrollbars
environment:
- PORT=3000
- DEBUG=browserless:*
- CONNECTION_TIMEOUT=600000
- MAX_CONCURRENT_SESSIONS=5
- ENABLE_DEBUGGER=true
- DEFAULT_LAUNCH_ARGS=["--no-sandbox","--disable-gpu","--disable-dev-shm-usage","--hide-scrollbars","--remote-allow-origins=*"]
networks:
- karakeep-int
# karakeep-chrome:
# image: ghcr.io/karakeep-app/karakeep-chrome:release
# restart: unless-stopped
# init: true
# command:
# - --disable-gpu
# - --disable-dev-shm-usage
# - --hide-scrollbars
# - --disable-blink-features=AutomationControlled
# - --window-size=1440,900
# networks:
# - karakeep-int
# image: ghcr.io/karakeep-app/karakeep-chrome:release
# restart: unless-stopped
# init: true
# command:
# # - --headless
# # - --remote-debugging-address=0.0.0.0
# - --disable-gpu
# - --disable-dev-shm-usage
# - --hide-scrollbars
# - --disable-blink-features=AutomationControlled
# - --window-size=1440,900
# networks:
# - karakeep-int
# ports:
# - "9222:9222"
# - "9223:9223"
meilisearch:
image: getmeili/meilisearch:v1.13.3
image: getmeili/meilisearch:v1.31.0
restart: unless-stopped
env_file:
- .env
@@ -59,9 +88,9 @@ services:
volumes:
- .:/code
- /data/library/ollama/ollama:/root/.ollama
devices:
- /dev/dri:/dev/dri
- /dev/kfd:/dev/kfd
# devices:
# - /dev/dri:/dev/dri
# - /dev/kfd:/dev/kfd
# pull_policy: always
tty: true
restart: always
+41
View File
@@ -0,0 +1,41 @@
server {
# Nginx versions 1.25+
listen 443 ssl;
listen [::]:443 ssl;
http2 on;
server_name mealie.loadingm.xyz;
acme_certificate letsencrypt;
ssl_certificate $acme_certificate;
ssl_certificate_key $acme_certificate_key;
ssl_certificate_cache max=2;
## The default `client_max_body_size` is 1M, this might not be enough for some posters, etc.
client_max_body_size 200G;
# Security / XSS Mitigation Headers
add_header X-Content-Type-Options "nosniff";
# Permissions policy. May cause issues with some clients
add_header Permissions-Policy "accelerometer=(), ambient-light-sensor=(), battery=(), bluetooth=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), gamepad=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), keyboard-map=(), local-fonts=(), magnetometer=(), microphone=(), payment=(), publickey-credentials-get=(), serial=(), sync-xhr=(), usb=(), xr-spatial-tracking=()" always;
# Content Security Policy
# See: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
# Enforces https content and restricts JS/CSS to origin
# External Javascript (such as cast_sender.js for Chromecast) must be whitelisted.
add_header Content-Security-Policy "default-src https: data: blob: ; img-src 'self' https://* ; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://www.gstatic.com https://www.youtube.com blob:; worker-src 'self' blob:; connect-src 'self'; object-src 'none'; frame-ancestors 'self'; font-src 'self'";
location / {
# Proxy main traffic
proxy_pass http://mealie:9000;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Protocol $scheme;
proxy_set_header X-Forwarded-Host $http_host;
# Disable buffering when the nginx proxy gets very resource heavy upon streaming
proxy_buffering off;
}
}
+1 -21
View File
@@ -19,28 +19,8 @@ server {
# Permissions policy. May cause issues with some clients
add_header Permissions-Policy "accelerometer=(), ambient-light-sensor=(), battery=(), bluetooth=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), gamepad=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), keyboard-map=(), local-fonts=(), magnetometer=(), microphone=(), payment=(), publickey-credentials-get=(), serial=(), sync-xhr=(), usb=(), xr-spatial-tracking=()" always;
location /grip/ws {
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_connect_timeout 1h;
proxy_send_timeout 1h;
proxy_read_timeout 1h;
proxy_pass http://sage-pushpin:7999/ws;
}
# Alias minio in case minio container is not present
set $minio http://sage-minio:9000;
location /minio/ {
rewrite ^/minio/(.*)$ /$1 break;
proxy_pass $minio;
}
location /api/ {
proxy_pass http://sage-api:3000/;
}
location / {
proxy_pass http://sage-static:80/;
return 404;
}
}
+27
View File
@@ -0,0 +1,27 @@
server {
# SSL configuration
listen 443 ssl;
listen [::]:443 ssl;
http2 on;
server_name webdav.loadingm.xyz;
acme_certificate letsencrypt;
ssl_certificate $acme_certificate;
ssl_certificate_key $acme_certificate_key;
ssl_certificate_cache max=2;
root /data/webdav;
# Security / XSS Mitigation Headers
add_header X-Content-Type-Options "nosniff";
# Permissions policy. May cause issues with some clients
add_header Permissions-Policy "accelerometer=(), ambient-light-sensor=(), battery=(), bluetooth=(), camera=(), clipboard-read=(), display-capture=(), document-domain=(), encrypted-media=(), gamepad=(), geolocation=(), gyroscope=(), hid=(), idle-detection=(), interest-cohort=(), keyboard-map=(), local-fonts=(), magnetometer=(), microphone=(), payment=(), publickey-credentials-get=(), serial=(), sync-xhr=(), usb=(), xr-spatial-tracking=()" always;
location /main {
return 404;
}
location / {
return 404;
}
}
+17 -123
View File
@@ -1,130 +1,24 @@
# This config file is for RecipeSage-selfhost config version 4.3.1, and RecipeSage version 3.0.10.
services:
# sage-proxy: # The proxy must not be removed. If needed, point your own proxy to this container, rather than removing this
# # container_name: recipesage_proxy
# image: julianpoy/recipesage-selfhost-proxy:v4.0.0
mealie:
image: ghcr.io/mealie-recipes/mealie:v3.30.0 #
# container_name: mealie
restart: always
# ports:
# - 7270:80
# depends_on:
# - sage-static
# - sage-api
# - sage-pushpin
# restart: unless-stopped
sage-static: # Hosts frontend assets
# container_name: recipesage_static
image: julianpoy/recipesage-selfhost:static-v3.0.10
restart: unless-stopped
networks:
- sage
sage-api: # Hosts backend API
# container_name: recipesage_api
image: julianpoy/recipesage-selfhost:api-v3.0.10
depends_on:
sage-postgres:
condition: service_healthy
sage-typesense:
condition: service_started
sage-pushpin:
condition: service_started
sage-browserless:
condition: service_started
networks:
- sage
- ollama-int
command: sh -c "npx prisma migrate deploy; npx nx seed prisma; npx ts-node --swc --project packages/backend/tsconfig.json packages/backend/src/bin/www"
environment:
- STORAGE_TYPE=filesystem
- FILESYSTEM_STORAGE_PATH=/rs-media
- NODE_ENV=selfhost
- VERBOSE=false
- VERSION=selfhost
- POSTGRES_DB=recipesage_selfhost # If changing this, make sure to update the postgres container and the DATABASE_URL below accordingly
- POSTGRES_USER=recipesage_selfhost # If changing this, make sure to update the postgres container and the DATABASE_URL below accordingly
- POSTGRES_PASSWORD=recipesage_selfhost # If changing this, make sure to update the postgres container and the DATABASE_URL below accordingly
- POSTGRES_PORT=5432 # If changing this, make sure to update the postgres container and the DATABASE_URL below accordingly
- POSTGRES_HOST=sage-postgres # If changing this, make sure to update the postgres container and the DATABASE_URL below accordingly
- POSTGRES_SSL=false
- POSTGRES_LOGGING=false
- DATABASE_URL=postgresql://recipesage_selfhost:recipesage_selfhost@sage-postgres:5432/recipesage_selfhost # Format is: postgresql://USERNAME:PASSWORD@HOST:PORT/DBNAME and must match the variables from the postgres container if you decide to change them
- GCM_KEYPAIR
- SENTRY_DSN
- GRIP_URL=http://sage-pushpin:5561/
- GRIP_KEY=changeme
- SEARCH_PROVIDER=typesense
- 'TYPESENSE_NODES=[{"host": "sage-typesense", "port": 8108, "protocol": "http"}]'
- TYPESENSE_API_KEY=recipesage_selfhost
- STRIPE_SK # Value should not be set.
- STRIPE_WEBHOOK_SECRET # Value should not be set
- BROWSERLESS_HOST=sage-browserless
- BROWSERLESS_PORT=3000
- BROWSERLESS_TOKEN=
- INGREDIENT_INSTRUCTION_CLASSIFIER_URL=http://sage-ingredient-instruction-classifier:3000/
- OPENAI_API_KEY=ollama # Please follow the instructions in the README if you decide to supply a value here
- OPENAI_API_BASE_URL=http://ollama:11434/v1/
# - "9925:9000" #
deploy:
resources:
limits:
memory: 1000M #
volumes:
- /srv/sage/apimedia:/rs-media
restart: unless-stopped
sage-typesense: # Provides the fuzzy search engine
# container_name: recipesage_typesense
image: typesense/typesense:0.24.1
- /data/mealie:/app/data/
networks:
- sage
volumes:
- /srv/sage/typesensedata:/data
command: "--data-dir /data --api-key=recipesage_selfhost --enable-cors"
restart: unless-stopped
sage-pushpin: # Provides websocket support
# container_name: recipesage_pushpin
image: julianpoy/pushpin:2023-09-17
networks:
- sage
entrypoint: /bin/sh -c
command:
[
'sed -i "s/sig_key=changeme/sig_key=$$GRIP_KEY/" /etc/pushpin/pushpin.conf && echo "* $${TARGET},over_http" > /etc/pushpin/routes && pushpin --merge-output',
]
- mealie
environment:
- GRIP_KEY=changeme
- TARGET=api:3000
restart: unless-stopped
sage-postgres: # Database
# container_name: recipesage_postgres
image: postgres:16
networks:
- sage
environment:
- POSTGRES_DB=recipesage_selfhost # If you change this, make sure to change both POSTGRES_DB and DATABASE_URL on the API container
- POSTGRES_USER=recipesage_selfhost # If you change this, make sure to change both POSTGRES_USER and DATABASE_URL on the API container
- POSTGRES_PASSWORD=recipesage_selfhost # If you change this, make sure to change both POSTGRES_PASSWORD and DATABASE_URL on the API container
- PGUSER=recipesage_selfhost # Change to db user
volumes:
- /srv/sage/postgresdata:/var/lib/postgresql/data
restart: unless-stopped
healthcheck:
test: ["CMD-SHELL", "pg_isready", "-d", "db_prod", "-U", "recipesage_selfhost"] # Change to db user
interval: 5s
timeout: 5s
retries: 5
start_period: 10s
sage-browserless: # A headless browser for scraping websites with the auto import tool
# container_name: recipesage_browserless
image: ghcr.io/browserless/chromium:v2.24.3
networks:
- sage
environment:
- MAX_CONCURRENT_SESSIONS=3
- MAX_QUEUE_LENGTH=10
restart: unless-stopped
# Uncomment the lines below to enable the ingredient instruction classifier. It's somewhat resource intensive (and large) and requires AVX instruction support on your CPU, but does improve site compatibility for the automatic import tool.
sage-ingredient-instruction-classifier: # An _optional_ server that runs a machine learning model able to classify text for improved automatic import site support. Not required for application to run, and will crash if your CPU does not support AVX instructions
# container_name: recipesage_classifier
image: julianpoy/ingredient-instruction-classifier:1.4.11
networks:
- sage
environment:
- SENTENCE_EMBEDDING_BATCH_SIZE=200
- PREDICTION_CONCURRENCY=2
restart: unless-stopped
# Set Backend ENV Variables Here
ALLOW_SIGNUP: "false"
PUID: 1000
PGID: 1000
TZ: America/Chicago
BASE_URL: https://mealie.loadingm.xyz