From 3f70835857863207ae399e6aa803d8b4285ef699 Mon Sep 17 00:00:00 2001 From: arch3rPro <30855883+arch3rPro@users.noreply.github.com> Date: Tue, 8 Jul 2025 10:26:21 +0800 Subject: [PATCH] feat: update karakeep 0.2.0 --- apps/hexo/main/.env.sample | 2 - apps/hexo/main/data.yml | 10 ---- apps/hexo/stable-25-05-01/.env.sample | 5 ++ apps/hexo/stable-25-05-01/data.yml | 31 +++++++++++++ .../docker-compose.yml | 13 ++++-- apps/karakeep/{0.24.1 => 0.25.0}/data.yml | 0 apps/karakeep/0.25.0/docker-compose.yml | 46 +++++++++++++++++++ apps/karakeep/README.md | 4 +- apps/karakeep/latest/data.yml | 31 +++++++++++++ .../{0.24.1 => latest}/docker-compose.yml | 2 +- 10 files changed, 124 insertions(+), 20 deletions(-) delete mode 100644 apps/hexo/main/.env.sample delete mode 100644 apps/hexo/main/data.yml create mode 100644 apps/hexo/stable-25-05-01/.env.sample create mode 100644 apps/hexo/stable-25-05-01/data.yml rename apps/hexo/{main => stable-25-05-01}/docker-compose.yml (55%) rename apps/karakeep/{0.24.1 => 0.25.0}/data.yml (100%) create mode 100644 apps/karakeep/0.25.0/docker-compose.yml create mode 100644 apps/karakeep/latest/data.yml rename apps/karakeep/{0.24.1 => latest}/docker-compose.yml (96%) diff --git a/apps/hexo/main/.env.sample b/apps/hexo/main/.env.sample deleted file mode 100644 index f62b64a..0000000 --- a/apps/hexo/main/.env.sample +++ /dev/null @@ -1,2 +0,0 @@ -CONTAINER_NAME="hexo" -PANEL_APP_PORT_HTTP="40064" diff --git a/apps/hexo/main/data.yml b/apps/hexo/main/data.yml deleted file mode 100644 index 58520a1..0000000 --- a/apps/hexo/main/data.yml +++ /dev/null @@ -1,10 +0,0 @@ -additionalProperties: - formFields: - - default: 40064 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Port - labelZh: 端口 - required: true - rule: paramPort - type: number diff --git a/apps/hexo/stable-25-05-01/.env.sample b/apps/hexo/stable-25-05-01/.env.sample new file mode 100644 index 0000000..f6c6fa5 --- /dev/null +++ b/apps/hexo/stable-25-05-01/.env.sample @@ -0,0 +1,5 @@ +CONTAINER_NAME="hexo" +PANEL_APP_PORT_HTTP="40064" +DATA_PATH="./data" +GIT_USERNAME="gituser" +GIT_MAIL="user@email.com" diff --git a/apps/hexo/stable-25-05-01/data.yml b/apps/hexo/stable-25-05-01/data.yml new file mode 100644 index 0000000..77eb60d --- /dev/null +++ b/apps/hexo/stable-25-05-01/data.yml @@ -0,0 +1,31 @@ +additionalProperties: + formFields: + - default: 40064 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: ./data + edit: true + envKey: DATA_PATH + labelEn: Data folder path + labelZh: 数据文件夹路径 + required: true + type: text + - default: "" + edit: true + envKey: GIT_USERNAME + labelEn: Git username + labelZh: Git 用户名 + required: true + type: text + - default: "" + edit: true + envKey: GIT_MAIL + labelEn: Git Email + labelZh: Git 邮箱 + required: true + type: text diff --git a/apps/hexo/main/docker-compose.yml b/apps/hexo/stable-25-05-01/docker-compose.yml similarity index 55% rename from apps/hexo/main/docker-compose.yml rename to apps/hexo/stable-25-05-01/docker-compose.yml index 528460a..a086570 100644 --- a/apps/hexo/main/docker-compose.yml +++ b/apps/hexo/stable-25-05-01/docker-compose.yml @@ -7,14 +7,17 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:4000" volumes: - - hexo_data:/home/hexo/.hexo - image: taskbjorn/hexo:main + - "${DATA_PATH}:/app" + environment: + - PUID=1000 + - PGID=1000 + - TZ=Asia/Shanghai + - GIT_USER=${GIT_USERNAME} + - GIT_EMAIL=${GIT_MAIL} + image: bloodstar/hexo:stable-25-05-01 labels: createdBy: "Apps" -volumes: - hexo_data: - networks: 1panel-network: external: true diff --git a/apps/karakeep/0.24.1/data.yml b/apps/karakeep/0.25.0/data.yml similarity index 100% rename from apps/karakeep/0.24.1/data.yml rename to apps/karakeep/0.25.0/data.yml diff --git a/apps/karakeep/0.25.0/docker-compose.yml b/apps/karakeep/0.25.0/docker-compose.yml new file mode 100644 index 0000000..2637d0f --- /dev/null +++ b/apps/karakeep/0.25.0/docker-compose.yml @@ -0,0 +1,46 @@ +services: + karakeep: + image: ghcr.io/karakeep-app/karakeep:0.25.0 + container_name: ${CONTAINER_NAME} + restart: unless-stopped + volumes: + # By default, the data is stored in a docker volume called "data". + # If you want to mount a custom directory, change the volume mapping to: + # - /path/to/your/directory:/data + - data:/data + ports: + - "${PANEL_APP_PORT_HTTP}:3000" + environment: + MEILI_ADDR: http://meilisearch:7700 + BROWSER_WEB_URL: http://chrome:9222 + OPENAI_API_KEY: ${OPENAI_API_KEY} + NEXTAUTH_SECRET: ${NEXTAUTH_SECRET} + MEILI_MASTER_KEY: ${MEILI_MASTER_KEY} + NEXTAUTH_URL: http://localhost:3000 + + # You almost never want to change the value of the DATA_DIR variable. + # If you want to mount a custom directory, change the volume mapping above instead. + DATA_DIR: /data # DON'T CHANGE THIS + chrome: + image: gcr.io/zenika-hub/alpine-chrome:124 + container_name: chrome-${CONTAINER_NAME} + 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 + meilisearch: + image: getmeili/meilisearch:v1.15.2 + container_name: meili-${CONTAINER_NAME} + restart: unless-stopped + environment: + MEILI_NO_ANALYTICS: "true" + volumes: + - meilisearch:/meili_data + +volumes: + meilisearch: + data: diff --git a/apps/karakeep/README.md b/apps/karakeep/README.md index 84109d8..cba9925 100644 --- a/apps/karakeep/README.md +++ b/apps/karakeep/README.md @@ -4,9 +4,9 @@ > *karakeep(原名Hoarder) 是一个独立的非商业项目。它与 Hordr.app 或其所有者没有任何关联、支持或联系。* -[![主页截图](https://github.com/hoarder-app/hoarder/raw/main/screenshots/homepage.png?raw=true)](https://github.com/hoarder-app/hoarder/blob/main/screenshots/homepage.png?raw=true) +![](https://cdn.jsdelivr.net/gh/xiaoY233/PicList@main/public/assets/Karakeep.png) -![Copyright-arch3rPro](https://img.shields.io/badge/Copyright-arch3rPro-ff9800?style=flat&logo=github&logoColor=white) +![](https://img.shields.io/badge/Copyright-arch3rPro-ff9800?style=flat&logo=github&logoColor=white) ## 特征 diff --git a/apps/karakeep/latest/data.yml b/apps/karakeep/latest/data.yml new file mode 100644 index 0000000..d09bd7f --- /dev/null +++ b/apps/karakeep/latest/data.yml @@ -0,0 +1,31 @@ +additionalProperties: + formFields: + - default: 30012 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: "ky0QvBQNLBQFxY6OurQV/6Wg2KjHqS0YSktBRPJw23QWqq5m" + edit: true + envKey: NEXTAUTH_SECRET + labelEn: NextAuth Secret + labelZh: NextAuth密钥 + required: true + type: text + - default: "a+BQCRpK74QuCSqZPhJ6hDeryTn/1rFKhwuc5DC19hOrI8VR" + edit: true + envKey: MEILI_MASTER_KEY + labelEn: Meilisearch Master Key + labelZh: Meilisearch主密钥 + required: true + type: text + - default: "" + edit: true + envKey: OPENAI_API_KEY + labelEn: OpenAI API Key + labelZh: OpenAI API 密钥 + required: false + type: text \ No newline at end of file diff --git a/apps/karakeep/0.24.1/docker-compose.yml b/apps/karakeep/latest/docker-compose.yml similarity index 96% rename from apps/karakeep/0.24.1/docker-compose.yml rename to apps/karakeep/latest/docker-compose.yml index c9bd544..be833bd 100644 --- a/apps/karakeep/0.24.1/docker-compose.yml +++ b/apps/karakeep/latest/docker-compose.yml @@ -1,6 +1,6 @@ services: karakeep: - image: ghcr.io/karakeep-app/karakeep:0.24.1 + image: ghcr.io/karakeep-app/karakeep:latest container_name: ${CONTAINER_NAME} restart: unless-stopped volumes: