Update Dockerfile

Removed deprecated environment variables and added new options.

karakeep/Dockerfile

@@ -57,6 +57,7 @@ RUN \
         ttf-freefont \
         font-noto-emoji \
         font-wqy-zenhei \
+        unzip \
     && mkdir -p /usr/src/chrome \
     && adduser -D chrome \
     && chown -R chrome:chrome /usr/src/chrome
@@ -109,6 +110,28 @@ RUN chmod 777 /.bashio-standalone.sh
 
 RUN sed -i "s|/usr/bin/env|/usr/bin/with-contenv|g" /etc/cont-init.d/*
 
+RUN set -e; \
+    extensions_dir="/usr/src/chrome/extensions"; \
+    mkdir -p "${extensions_dir}"; \
+    for entry in \
+      "i-dont-care-about-cookies:fllaojicojecljbmefodhfapmkghcbnh" \
+      "ublock-origin:cjpalhdlnbpafiamejdnhcphjbkeiagm"; do \
+        name="${entry%%:*}"; \
+        ext_id="${entry##*:}"; \
+        curl -fsSL "https://clients2.google.com/service/update2/crx?response=redirect&prodversion=120.0&acceptformat=crx2,crx3&x=id%3D${ext_id}%26installsource%3Dondemand%26uc" \
+          -o "/tmp/${name}.crx"; \
+        rm -rf "${extensions_dir:?}/${name}"; \
+        mkdir -p "${extensions_dir}/${name}"; \
+        rc=0; \
+        unzip -q "/tmp/${name}.crx" -d "${extensions_dir}/${name}" || rc=$$?; \
+        if [ "$$rc" -ne 0 ] && [ "$$rc" -ne 1 ]; then \
+          echo "ERROR: unzip failed for ${name} (rc=$$rc)"; \
+          exit "$$rc"; \
+        fi; \
+        rm -f "/tmp/${name}.crx"; \
+    done; \
+    chown -R chrome:chrome "${extensions_dir}"
+
 ############
 # 5 Labels #
 ############

karakeep/README.md

@@ -63,7 +63,7 @@ Webui can be found at `<your-ip>:3000`.
 | `CRAWLER_VIDEO_DOWNLOAD_MAX_SIZE` | int | | Max video size (MB). |
 | `CRAWLER_VIDEO_DOWNLOAD_TIMEOUT_SEC` | int | | Video download timeout. |
 | `CRAWLER_ENABLE_ADBLOCKER` | bool | `true` | Enable ad blocking in the crawler. |
-| `CHROME_EXTENSIONS_DIR` | str | `/share/karakeep/extensions` | Host-mounted extensions directory for headless Chromium. |
+| `CHROME_EXTENSIONS_DIR` | str | `/usr/src/chrome/extensions` | Extensions directory for headless Chromium. |
 | `MEILI_MASTER_KEY` | password | | Meilisearch master key (auto-generated if left blank). |
 | `MEILI_ADDR` | str | | Meilisearch URL. |
 | `BROWSER_WEB_URL` | str | | Chromium remote debugging URL. |
@@ -72,15 +72,9 @@ Webui can be found at `<your-ip>:3000`.
 
 ### Extensions for headless Chromium
 
-This add-on loads extensions in headless Chromium with the `--headless=new` flag. To use the included defaults:
+This add-on loads extensions in headless Chromium with the `--headless=new` flag. The defaults are downloaded automatically during the image build and refreshed each time the add-on starts into `/usr/src/chrome/extensions` (non-persistent).
 
-1. Create these folders on the host (via the `/share` mount):
-   - `/share/karakeep/extensions/i-dont-care-about-cookies`
-   - `/share/karakeep/extensions/ublock-origin`
-2. Unzip each extension into its corresponding folder.
-3. Restart the add-on.
-
-You can override the base folder with the `CHROME_EXTENSIONS_DIR` option. Any missing extension folder is skipped at runtime.
+You can override the base folder with the `CHROME_EXTENSIONS_DIR` option to point to a host-mounted directory if you prefer to manage extensions manually. Any missing extension folder is skipped at runtime.
 
 ### Custom Scripts and Environment Variables
 

karakeep/config.yaml

@@ -1,78 +1,57 @@
 arch:
   - aarch64
   - amd64
+name: Karakeep
+slug: karakeep
 description: bookmark-everything app with a touch of AI for the data hoarders out there
-environment:
-  BROWSER_WEB_URL: http://127.0.0.1:9222
-  CHROME_EXTENSIONS_DIR: /share/karakeep/extensions
-  DATA_DIR: /data
-  DISABLE_NEW_RELEASE_CHECK: "true"
-  MEILI_ADDR: http://127.0.0.1:7700
-  MEILI_MASTER_KEY: ""
-  MEILI_NO_ANALYTICS: "true"
-  XDG_CACHE_HOME: /data/cache
+version: "0.30.0"
+url: https://github.com/alexbelgium/hassio-addons/tree/master/karakeep
 image: ghcr.io/alexbelgium/karakeep-{arch}
 init: false
-map:
-  - addon_config:rw
-  - share:rw
-name: Karakeep
-options:
-  env_vars: []
-  CHROME_EXTENSIONS_DIR: /share/karakeep/extensions
-  CRAWLER_DOWNLOAD_BANNER_IMAGE: true
-  CRAWLER_ENABLE_ADBLOCKER: true
-  CRAWLER_FULL_PAGE_ARCHIVE: false
-  CRAWLER_FULL_PAGE_SCREENSHOT: false
-  CRAWLER_STORE_SCREENSHOT: false
-  DISABLE_SIGNUPS: false
-  BROWSER_WEB_URL: http://127.0.0.1:9222
-  DATA_DIR: /data
-  MAX_ASSET_SIZE_MB: 4
-  MEILI_ADDR: http://127.0.0.1:7700
-  MEILI_MASTER_KEY: ""
-  NEXTAUTH_SECRET: ""
-  TZ: Etc/UTC
 ports:
   3000/tcp: 3000
 ports_description:
   3000/tcp: Web UI
+webui: "[PROTO:ssl]://[HOST]:[PORT:3000]"
+map:
+  - addon_config:rw
+  - share:rw
+environment:
+  DATA_DIR: /data
+  XDG_CACHE_HOME: /data/cache
+  BROWSER_WEB_URL: http://127.0.0.1:9222
+  CHROME_EXTENSIONS_DIR: /usr/src/chrome/extensions
+  MEILI_ADDR: http://127.0.0.1:7700
+  MEILI_NO_ANALYTICS: "true"
+  DISABLE_NEW_RELEASE_CHECK: "true"
+options:
+  TZ: Etc/UTC
+  DISABLE_SIGNUPS: false
+  NEXTAUTH_SECRET: ""
+  NEXTAUTH_URL: ""
+  MAX_ASSET_SIZE_MB: 4
+  OPENAI_API_KEY: ""
+  OCR_LANGS: ""
+  INFERENCE_LANG: ""
+  CRAWLER_DOWNLOAD_BANNER_IMAGE: true
+  CRAWLER_STORE_SCREENSHOT: true
+  CRAWLER_FULL_PAGE_SCREENSHOT: true
+  CRAWLER_FULL_PAGE_ARCHIVE: true
+  CRAWLER_ENABLE_ADBLOCKER: true
+  CRAWLER_VIDEO_DOWNLOAD: false
 schema:
-  env_vars:
-    - name: match(^[A-Za-z0-9_]+$)
-      value: str?
-  BROWSER_WEB_URL: str?
-  CHROME_EXTENSIONS_DIR: str?
-  DATA_DIR: str?
+  TZ: str?
   DISABLE_SIGNUPS: bool
-  MEILI_ADDR: str?
-  MEILI_MASTER_KEY: password?
-  MAX_ASSET_SIZE_MB: int?
   NEXTAUTH_SECRET: password?
   NEXTAUTH_URL: str?
-  OCR_LANGS: str?
-  OCR_CONFIDENCE_THRESHOLD: int(0,100)?
-  OPENAI_BASE_URL: str?
+  MAX_ASSET_SIZE_MB: int?
   OPENAI_API_KEY: password?
-  OLLAMA_BASE_URL: str?
-  INFERENCE_TEXT_MODEL: str?
-  INFERENCE_IMAGE_MODEL: str?
-  EMBEDDING_TEXT_MODEL: str?
-  INFERENCE_CONTEXT_LENGTH: int(0,)?
+  OCR_LANGS: str?
   INFERENCE_LANG: str?
-  INFERENCE_JOB_TIMEOUT_SEC: int(0,)?
+  MEILI_MASTER_KEY: str?
   CRAWLER_DOWNLOAD_BANNER_IMAGE: bool
   CRAWLER_STORE_SCREENSHOT: bool
   CRAWLER_FULL_PAGE_SCREENSHOT: bool
   CRAWLER_FULL_PAGE_ARCHIVE: bool
-  CRAWLER_JOB_TIMEOUT_SEC: int(0,)?
-  CRAWLER_NAVIGATE_TIMEOUT_SEC: int(0,)?
-  CRAWLER_VIDEO_DOWNLOAD: bool?
-  CRAWLER_VIDEO_DOWNLOAD_MAX_SIZE: int?
-  CRAWLER_VIDEO_DOWNLOAD_TIMEOUT_SEC: int(0,)?
   CRAWLER_ENABLE_ADBLOCKER: bool
-  TZ: str?
-slug: karakeep
-url: https://github.com/alexbelgium/hassio-addons/tree/master/karakeep
-version: "0.30.0"
-webui: "[PROTO:ssl]://[HOST]:[PORT:3000]"
+  CRAWLER_VIDEO_DOWNLOAD: bool?

karakeep/rootfs/etc/cont-init.d/90-folders.sh

@@ -7,9 +7,9 @@ bashio::log.info "Creating folders"
 mkdir -p \
   /data/cache \
   /data/chrome \
-  /share/karakeep/extensions \
-  /config/meili
+  /config/meili \
+  /usr/src/chrome/extensions
 
 if id chrome &>/dev/null; then
-  chown -R chrome:chrome /data/cache /data/chrome
+  chown -R chrome:chrome /data/cache /data/chrome /usr/src/chrome/extensions
 fi

karakeep/rootfs/etc/cont-init.d/92-chrome-extensions.sh

@@ -0,0 +1,30 @@
+#!/command/with-contenv bashio
+# shellcheck shell=bash
+set -e
+
+EXTENSIONS_DIR="${CHROME_EXTENSIONS_DIR:-/usr/src/chrome/extensions}"
+
+bashio::log.info "Refreshing Chromium extensions in ${EXTENSIONS_DIR}"
+
+mkdir -p "${EXTENSIONS_DIR}"
+
+download_extension() {
+  local name="$1"
+  local extension_id="$2"
+  local crx_path
+
+  crx_path="$(mktemp)"
+  curl -fsSL "https://clients2.google.com/service/update2/crx?response=redirect&prodversion=120.0&acceptformat=crx2,crx3&x=id%3D${extension_id}%26installsource%3Dondemand%26uc" \
+    -o "${crx_path}"
+  rm -rf "${EXTENSIONS_DIR:?}/${name}"
+  mkdir -p "${EXTENSIONS_DIR}/${name}"
+  unzip -q "${crx_path}" -d "${EXTENSIONS_DIR}/${name}"
+  rm -f "${crx_path}"
+}
+
+download_extension "i-dont-care-about-cookies" "fllaojicojecljbmefodhfapmkghcbnh"
+download_extension "ublock-origin" "cjpalhdlnbpafiamejdnhcphjbkeiagm"
+
+if id chrome &>/dev/null; then
+  chown -R chrome:chrome "${EXTENSIONS_DIR}"
+fi

karakeep/rootfs/etc/s6-overlay/s6-rc.d/svc-chrome/run

@@ -2,7 +2,7 @@
 # shellcheck shell=bash
 set -e
 
-EXTENSIONS_DIR="${CHROME_EXTENSIONS_DIR:-/share/karakeep/extensions}"
+EXTENSIONS_DIR="${CHROME_EXTENSIONS_DIR:-/usr/src/chrome/extensions}"
 
 extensions=()
 for extension in "${EXTENSIONS_DIR}/i-dont-care-about-cookies" "${EXTENSIONS_DIR}/ublock-origin"; do