From c88437200791c291929eb7bf0883e1eb8a9e6007 Mon Sep 17 00:00:00 2001 From: redbeardymcgee Date: Fri, 29 Nov 2024 19:35:18 -0600 Subject: [PATCH] wip complete: hoarder --- WIP/hoarder/hoarder.env | 50 ------------------ .../hoarder/chrome.container | 4 +- quadlets/hoarder/data.volume | 2 + {WIP => quadlets}/hoarder/hoarder.container | 11 ++-- quadlets/hoarder/hoarder.env | 51 +++++++++++++++++++ .../hoarder/meilisearch.container | 11 ++-- quadlets/hoarder/meilisearch.volume | 2 + 7 files changed, 62 insertions(+), 69 deletions(-) delete mode 100644 WIP/hoarder/hoarder.env rename WIP/hoarder/hoarder-chrome.container => quadlets/hoarder/chrome.container (86%) create mode 100644 quadlets/hoarder/data.volume rename {WIP => quadlets}/hoarder/hoarder.container (57%) create mode 100644 quadlets/hoarder/hoarder.env rename WIP/hoarder/hoarder-meilisearch.container => quadlets/hoarder/meilisearch.container (61%) create mode 100644 quadlets/hoarder/meilisearch.volume diff --git a/WIP/hoarder/hoarder.env b/WIP/hoarder/hoarder.env deleted file mode 100644 index 5befa51..0000000 --- a/WIP/hoarder/hoarder.env +++ /dev/null @@ -1,50 +0,0 @@ -# https://docs.hoarder.app/configuration/ -DATA_DIR= -NEXTAUTH_URL= -NEXTAUTH_SECRET= -MEILI_ADDR= -MEILI_MASTER_KEY= -MAX_ASSET_SIZE_MB= -DISABLE_NEW_RELEASE_CHECK= - -# Authentication / Signup -DISABLE_SIGNUPS= -DISABLE_PASSWORD_AUTH= -OAUTH_WELLKNOWN_URL= -OAUTH_CLIENT_SECRET= -OAUTH_CLIENT_ID= -OAUTH_SCOPE= -OAUTH_PROVIDER_NAME= -OAUTH_ALLOW_DANGEROUS_EMAIL_ACCOUNT_LINKING= - -# Inference -OPENAI_API_KEY= -OPENAI_BASE_URL= -OLLAMA_BASE_URL= -OLLAMA_KEEP_ALIV= -INFERENCE_TEXT_MODEL= -INFERENCE_IMAGE_MODEL= -INFERENCE_CONTEXT_LENGTH= -INFERENCE_LANG= -INFERENCE_JOB_TIMEOUT_SEC= - -# Crawler -CRAWLER_NUM_WORKERS= -BROWSER_WEB_URL= -BROWSER_WEBSOCKET_URL= -BROWSER_CONNECT_ONDEMAND= -CRAWLER_DOWNLOAD_BANNER_IMAGE= -CRAWLER_STORE_SCREENSHOT= -CRAWLER_FULL_PAGE_SCREENSHOT= -CRAWLER_FULL_PAGE_ARCHIVE= -CRAWLER_JOB_TIMEOUT_SEC= -CRAWLER_NAVIGATE_TIMEOUT_SEC= -CRAWLER_VIDEO_DOWNLOAD= -CRAWLER_VIDEO_DOWNLOAD_MAX_SIZE= -CRAWLER_VIDEO_DOWNLOAD_TIMEOUT_SEC= - -# OCR -OCR_CACHE_DIR= -OCR_LANGS= -OCR_CONFIDENCE_THRESHOLD= - diff --git a/WIP/hoarder/hoarder-chrome.container b/quadlets/hoarder/chrome.container similarity index 86% rename from WIP/hoarder/hoarder-chrome.container rename to quadlets/hoarder/chrome.container index e9edbf5..6783281 100644 --- a/WIP/hoarder/hoarder-chrome.container +++ b/quadlets/hoarder/chrome.container @@ -1,5 +1,5 @@ [Unit] -Description=Hoarder requirement +Description=Hoarder chrome browser After=network-online.target [Service] @@ -14,6 +14,4 @@ Image=ghcr.io/zenika-hub/alpine-chrome:123 ContainerName=hoarder-chrome HostName=hoarder-chrome -Network=hoarder.network - Exec=--no-sandbox --disable-gpu --disable-dev-shm-usage --remote-debugging-address=0.0.0.0 --remote-debugging-port=9222 --hide-scrollbars diff --git a/quadlets/hoarder/data.volume b/quadlets/hoarder/data.volume new file mode 100644 index 0000000..dcce9d0 --- /dev/null +++ b/quadlets/hoarder/data.volume @@ -0,0 +1,2 @@ +[Volume] +VolumeName=hoarder-data diff --git a/WIP/hoarder/hoarder.container b/quadlets/hoarder/hoarder.container similarity index 57% rename from WIP/hoarder/hoarder.container rename to quadlets/hoarder/hoarder.container index 8020866..99479b2 100644 --- a/WIP/hoarder/hoarder.container +++ b/quadlets/hoarder/hoarder.container @@ -10,20 +10,15 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -Image=ghcr.io/hoarder-app/hoarder:0.18.0 +Image=ghcr.io/hoarder-app/hoarder:release ContainerName=hoarder HostName=hoarder -Network=protonvpn -PublishPort=3095:3000 +PublishPort=3000 -Volume=/volumes/hoarder/data:/data +Volume=hoarder-data:/data EnvironmentFile=hoarder.env -Environment=MEILI_ADDR=http://hoarder-meilisearch:7700 -Environment=BROWSER_WEB_URL=http://hoarder-chrome:9222 -Environment=DATA_DIR=/data -Environment=NEXTAUTH_URL=http://10.0.0.3:3095 Secret=nextauth-secret,type=env,target=NEXTAUTH_SECRET Secret=meili-master-key,type=env,target=MEILI_MASTER_KEY diff --git a/quadlets/hoarder/hoarder.env b/quadlets/hoarder/hoarder.env new file mode 100644 index 0000000..ba2368f --- /dev/null +++ b/quadlets/hoarder/hoarder.env @@ -0,0 +1,51 @@ +# https://docs.hoarder.app/configuration/ +DATA_DIR=/data +NEXTAUTH_URL=http://localhost:3000 +#NEXTAUTH_SECRET= +MEILI_ADDR=meilisearch:7700 +#MEILI_MASTER_KEY= +MEILI_NO_ANALYTICS=true +#MAX_ASSET_SIZE_MB= +#DISABLE_NEW_RELEASE_CHECK= + +# Authentication / Signup +#DISABLE_SIGNUPS= +#DISABLE_PASSWORD_AUTH= +#OAUTH_WELLKNOWN_URL= +#OAUTH_CLIENT_SECRET= +#OAUTH_CLIENT_ID= +#OAUTH_SCOPE= +#OAUTH_PROVIDER_NAME= +#OAUTH_ALLOW_DANGEROUS_EMAIL_ACCOUNT_LINKING= + +# Inference +#OPENAI_API_KEY= +#OPENAI_BASE_URL= +#OLLAMA_BASE_URL= +#OLLAMA_KEEP_ALIV= +#INFERENCE_TEXT_MODEL= +#INFERENCE_IMAGE_MODEL= +#INFERENCE_CONTEXT_LENGTH= +#INFERENCE_LANG= +#INFERENCE_JOB_TIMEOUT_SEC= + +# Crawler +#CRAWLER_NUM_WORKERS= +BROWSER_WEB_URL=hoarder-chrome:9222 +#BROWSER_WEBSOCKET_URL= +#BROWSER_CONNECT_ONDEMAND= +#CRAWLER_DOWNLOAD_BANNER_IMAGE= +#CRAWLER_STORE_SCREENSHOT= +#CRAWLER_FULL_PAGE_SCREENSHOT= +#CRAWLER_FULL_PAGE_ARCHIVE= +#CRAWLER_JOB_TIMEOUT_SEC= +#CRAWLER_NAVIGATE_TIMEOUT_SEC= +#CRAWLER_VIDEO_DOWNLOAD= +#CRAWLER_VIDEO_DOWNLOAD_MAX_SIZE= +#CRAWLER_VIDEO_DOWNLOAD_TIMEOUT_SEC= + +# OCR +#OCR_CACHE_DIR= +#OCR_LANGS= +#OCR_CONFIDENCE_THRESHOLD= + diff --git a/WIP/hoarder/hoarder-meilisearch.container b/quadlets/hoarder/meilisearch.container similarity index 61% rename from WIP/hoarder/hoarder-meilisearch.container rename to quadlets/hoarder/meilisearch.container index 24a560e..e844bea 100644 --- a/WIP/hoarder/hoarder-meilisearch.container +++ b/quadlets/hoarder/meilisearch.container @@ -10,15 +10,10 @@ TimeoutStartSec=900 WantedBy=default.target [Container] -ContainerName=hoarder-meilisearch - Image=docker.io/getmeili/meilisearch:v1.6 +ContainerName=hoarder-meilisearch +HostName=hoarder-meilisearch EnvironmentFile=hoarder.env -Environment=MEILI_NO_ANALYTICS=true -Volume=/volumes/hoarder/meili_data:/meili_data - -Network=hoarder.network - -Secret=meili-master-key,type=env,target=MEILI_MASTER_KEY +Volume=meilisearch:/meili_data diff --git a/quadlets/hoarder/meilisearch.volume b/quadlets/hoarder/meilisearch.volume new file mode 100644 index 0000000..718daec --- /dev/null +++ b/quadlets/hoarder/meilisearch.volume @@ -0,0 +1,2 @@ +[Volume] +VolumeName=meilisearch