From 6b31e1ed45fed6405de155f33cb549ac62eab4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= Date: Mon, 29 Jul 2024 13:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BA=94=E7=94=A8=20LinkDing?= =?UTF-8?q?=20Docker=20Mailserver=20Pixman?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 萌森 --- linkding/1.31.0/docker-compose.yml | 7 ++++--- linkding/1.31.0/scripts/init.sh | 5 +++++ linkding/1.31.0/scripts/upgrade.sh | 5 +++++ linkding/README.md | 2 +- linkding/data.yml | 2 +- mailserver/data.yml | 6 +++--- minio/2024-06-11/docker-compose.yml | 11 ++++++----- minio/2024-06-11/scripts/init.sh | 5 +++++ minio/2024-06-11/scripts/upgrade.sh | 5 +++++ minio/README.md | 2 +- 10 files changed, 36 insertions(+), 14 deletions(-) diff --git a/linkding/1.31.0/docker-compose.yml b/linkding/1.31.0/docker-compose.yml index d0454b331..814d4f15b 100644 --- a/linkding/1.31.0/docker-compose.yml +++ b/linkding/1.31.0/docker-compose.yml @@ -6,7 +6,7 @@ networks: services: linkding: - image: sissbruecker/linkding:1.31.0-plus-alpine + image: sissbruecker/linkding:1.31.0-plus container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -20,10 +20,11 @@ services: hard: 40000 ports: - ${PANEL_APP_PORT_HTTP}:9090 + env_file: + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${LINKDING_ROOT_PATH}/data:/etc/linkding/data - env_file: - - .env environment: - LD_SERVER_PORT=9090 - LD_DB_ENGINE=postgres diff --git a/linkding/1.31.0/scripts/init.sh b/linkding/1.31.0/scripts/init.sh index c86c4fbca..77b849120 100644 --- a/linkding/1.31.0/scripts/init.sh +++ b/linkding/1.31.0/scripts/init.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/linkding/1.31.0/scripts/upgrade.sh b/linkding/1.31.0/scripts/upgrade.sh index c86c4fbca..77b849120 100644 --- a/linkding/1.31.0/scripts/upgrade.sh +++ b/linkding/1.31.0/scripts/upgrade.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/linkding/README.md b/linkding/README.md index b3046fa59..55b2e3329 100644 --- a/linkding/README.md +++ b/linkding/README.md @@ -2,7 +2,7 @@ 链接是一个简单的书签服务，您可以自己托管。 -![linkding](https://github.com/sissbruecker/linkding/blob/master/docs/linkding-screenshot.png) +![linkding](https://file.lifebus.top/imgs/linkding_cover.png) ## 特性 diff --git a/linkding/data.yml b/linkding/data.yml index b71d2c936..0a39069e9 100644 --- a/linkding/data.yml +++ b/linkding/data.yml @@ -15,4 +15,4 @@ additionalProperties: limit: 0 website: https://demo.linkding.link/ github: https://github.com/sissbruecker/linkding/ - document: https://github.com/sissbruecker/linkding/blob/master/README.md + document: https://github.com/sissbruecker/linkding/ diff --git a/mailserver/data.yml b/mailserver/data.yml index a69f52881..a69793eba 100644 --- a/mailserver/data.yml +++ b/mailserver/data.yml @@ -1,13 +1,13 @@ name: Mailserver -title: 是一个可用于生产的全栈但简单的邮件服务器 -description: 是一个可用于生产的全栈但简单的邮件服务器 +title: 可用于生产的全栈但简单的邮件服务器 +description: 可用于生产的全栈但简单的邮件服务器 additionalProperties: key: mailserver name: Mailserver tags: - Email - Local - shortDescZh: 是一个可用于生产的全栈但简单的邮件服务器 + shortDescZh: 可用于生产的全栈但简单的邮件服务器 shortDescEn: A fullstack but simple mail server (smtp, imap, antispam, antivirus, etc.) type: runtime crossVersionUpdate: true diff --git a/minio/2024-06-11/docker-compose.yml b/minio/2024-06-11/docker-compose.yml index 7a8d84780..44a219987 100644 --- a/minio/2024-06-11/docker-compose.yml +++ b/minio/2024-06-11/docker-compose.yml @@ -17,12 +17,9 @@ services: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json - environment: - - MINIO_VOLUMES=/data - - MINIO_API_ROOT_ACCESS=on - - MINIO_BROWSER_REDIRECT=true env_file: - - .env + - /etc/1panel/envs/global.env + - ${ENV_FILE:-/etc/1panel/envs/default.env} extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 volumes: @@ -33,3 +30,7 @@ services: max-size: "5M" max-file: "10" driver: json-file + environment: + - MINIO_VOLUMES=/data + - MINIO_API_ROOT_ACCESS=on + - MINIO_BROWSER_REDIRECT=true diff --git a/minio/2024-06-11/scripts/init.sh b/minio/2024-06-11/scripts/init.sh index c86c4fbca..77b849120 100644 --- a/minio/2024-06-11/scripts/init.sh +++ b/minio/2024-06-11/scripts/init.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/minio/2024-06-11/scripts/upgrade.sh b/minio/2024-06-11/scripts/upgrade.sh index c86c4fbca..77b849120 100644 --- a/minio/2024-06-11/scripts/upgrade.sh +++ b/minio/2024-06-11/scripts/upgrade.sh @@ -3,6 +3,11 @@ if [ -f .env ]; then source .env + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "Check Finish." else diff --git a/minio/README.md b/minio/README.md index ec32f5d34..30d2b99bd 100644 --- a/minio/README.md +++ b/minio/README.md @@ -2,7 +2,7 @@ MinIO 是一种高性能、S3 兼容的对象存储。它是为大规模 AI/ML、数据湖和数据库工作负载。它是软件定义的并在任何云或本地基础设施上运行。 -![MinIO](https://github.com/minio/minio/raw/master/docs/screenshots/pic1.png) +![MinIO](https://file.lifebus.top/imgs/minio_cover.png) ## 特性