From 7e3ab14cbe7b361a4f78cf4ab3480f7b8eafa826 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Fri, 25 Jul 2025 18:31:26 +0800 Subject: [PATCH 01/14] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=9C=8D=E5=8A=A1=E7=9A=84=E9=95=9C=E5=83=8F=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 memos 从 0.24.3 升级到 0.25.0 将 gitea 从 1.23.8-rootless 升级到 1.24.3-rootless 将 valkey 从 8.1.2 升级到 8.1.3 --- gitea/env.cfg | 2 +- memos/env.cfg | 2 +- searxng/env.cfg | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitea/env.cfg b/gitea/env.cfg index 065a450..09c6bca 100644 --- a/gitea/env.cfg +++ b/gitea/env.cfg @@ -1,4 +1,4 @@ -IMAGE_TAG=gitea/gitea:1.23.8-rootless +IMAGE_TAG=gitea/gitea:1.24.3-rootless Volumes_PATH=/data/volumes/gitea LAY_SSH_HOST_PORT=22 SSH_HOST_PORT=2222 \ No newline at end of file diff --git a/memos/env.cfg b/memos/env.cfg index 4eaa9ea..dbbfb17 100644 --- a/memos/env.cfg +++ b/memos/env.cfg @@ -1,2 +1,2 @@ -IMAGE_TAG=neosmemo/memos:0.24.3 +IMAGE_TAG=neosmemo/memos:0.25.0 Volumes_Path=/data/volumes/memos diff --git a/searxng/env.cfg b/searxng/env.cfg index a3ef85a..a177801 100644 --- a/searxng/env.cfg +++ b/searxng/env.cfg @@ -1,4 +1,4 @@ SearXNG_TAG=searxng/searxng:latest -Redis_TAG=valkey/valkey:8.1.2-alpine -Valkey_TAG=valkey/valkey:8.1.2 +Redis_TAG=valkey/valkey:8.1.3-alpine +Valkey_TAG=valkey/valkey:8.1.3 Volumes_PATH=/data/volumes/searxng From 4d4d8271a5c7b96ef7a134025c12517f8dbd3e31 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Wed, 30 Jul 2025 04:16:47 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20it-tools/env.cfg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- it-tools/env.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it-tools/env.cfg b/it-tools/env.cfg index fc3bfe2..a27d2c5 100644 --- a/it-tools/env.cfg +++ b/it-tools/env.cfg @@ -1 +1 @@ -IMAGE_TAG=cnphpbb/it-tools:20240520 \ No newline at end of file +IMAGE_TAG=hub.tp229.com:3500/cnphpbb/it-tools:20241022 \ No newline at end of file From 737068791b13ecce1e0ecf4d03593574e6d1e406 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 00:41:41 +0800 Subject: [PATCH 03/14] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=A0=87=E7=AD=BE=E8=87=B3v1.6.70?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- domain-admin/env.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-admin/env.cfg b/domain-admin/env.cfg index 9121577..6bc7e3d 100644 --- a/domain-admin/env.cfg +++ b/domain-admin/env.cfg @@ -1,2 +1,2 @@ -IMAGE_TAG=mouday/domain-admin:v1.6.63 +IMAGE_TAG=mouday/domain-admin:v1.6.70 Volumes_PATH=/data/volumes/domain-admin \ No newline at end of file From 4db3d9a715e06db6405446e24bd16a362b676e11 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 00:43:39 +0800 Subject: [PATCH 04/14] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20Portainer?= =?UTF-8?q?=20CE=20=E5=92=8C=20Agent=20=E9=95=9C=E5=83=8F=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=87=B3=202.27.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- portainer-ce/env.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portainer-ce/env.cfg b/portainer-ce/env.cfg index f457a34..e75c805 100644 --- a/portainer-ce/env.cfg +++ b/portainer-ce/env.cfg @@ -1,4 +1,4 @@ # IMAGE_LATEST=portainer/portainer-ce:2.19.4 #IMAGE_LATEST=portainer/portainer-ce:latest -IMAGE_TAG=portainer/portainer-ce:2.27.7 -AGENT_TAG=portainer/agent:2.27.7 +IMAGE_TAG=portainer/portainer-ce:2.27.9 +AGENT_TAG=portainer/agent:2.27.9 From 39792ea6b0f249042de348f6358bc279d8e7fcca Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 01:03:52 +0800 Subject: [PATCH 05/14] =?UTF-8?q?feat(redis):=20=E6=B7=BB=E5=8A=A0Redis?= =?UTF-8?q?=E5=92=8CValkey=E7=9A=84docker=20compose=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增Redis和Valkey的docker compose配置文件，包括环境变量配置和堆栈部署文件，支持多版本镜像选择和持久化存储配置 --- base/redis/env.cfg | 6 ++++++ base/redis/redis.stack.yml | 11 +++++++++++ base/redis/valkey.stack.yml | 11 +++++++++++ 3 files changed, 28 insertions(+) create mode 100644 base/redis/env.cfg create mode 100644 base/redis/redis.stack.yml create mode 100644 base/redis/valkey.stack.yml diff --git a/base/redis/env.cfg b/base/redis/env.cfg new file mode 100644 index 0000000..0c4fdc9 --- /dev/null +++ b/base/redis/env.cfg @@ -0,0 +1,6 @@ +IMAGE_TAG_REDISV6=redis:6.2.19-alpine +IMAGE_TAG_REDISV7=redis:7.2.10-alpine +IMAGE_TAG_REDISV8=redis:8.0.3-alpine +IMAGE_TAG_VALKEYV8=valkey/valkey:8.1.3-alpine +IMAGE_TAG_VALKEYV7=valkey/valkey:7.2.10-alpine +Volumes_PATH=/data/volumes/redis diff --git a/base/redis/redis.stack.yml b/base/redis/redis.stack.yml new file mode 100644 index 0000000..4442cda --- /dev/null +++ b/base/redis/redis.stack.yml @@ -0,0 +1,11 @@ +# Pull: docker compose -p redis --env-file ./base/redis/env.cfg -f ./base/redis/redis.stack.yml pull + +# Run:: docker compose -p redis --env-file ./base/redis/env.cfg -f ./base/redis/redis.stack.yml up -d +services: + redis: + image: ${IMAGE_TAG_REDISV8} + ports: + - '6379:6379' + command: redis-server --appendonly yes + volumes: + - '${Volumes_PATH}/redis:/data' diff --git a/base/redis/valkey.stack.yml b/base/redis/valkey.stack.yml new file mode 100644 index 0000000..6b969a2 --- /dev/null +++ b/base/redis/valkey.stack.yml @@ -0,0 +1,11 @@ +# Pull: docker compose -p valkey --env-file ./base/redis/env.cfg -f ./base/redis/valkey.stack.yml pull + +# Run:: docker compose -p valkey --env-file ./base/redis/env.cfg -f ./base/redis/valkey.stack.yml up -d +services: + redis: + image: ${IMAGE_TAG_VALKEYV8} + ports: + - '6379:6379' + command: valkey-server --appendonly yes + volumes: + - '${Volumes_PATH}/redis:/data' \ No newline at end of file From 2cf6fa4d4efdb41baebf6d798171e6fa0b89e6f4 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 03:23:37 +0800 Subject: [PATCH 06/14] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0README=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=85=8D=E8=B4=A3=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在README中添加免责声明，明确说明项目仅供分享且不保证稳定性 --- readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.md b/readme.md index 78b19c9..4fa5d18 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,6 @@ # 说明文档 自用的比较常规的 `docker-compose` 的 stack 脚本。 +**开源只是为了分享，不保证任何的稳定性。请根据自己的需求进行修改。** + From 06cd400bd509ee40599017a5a5772330175022c3 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 05:00:53 +0800 Subject: [PATCH 07/14] =?UTF-8?q?feat(shell):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=84=9A=E6=9C=ACrun.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加基础shell脚本文件用于执行程序 --- shell/run.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 shell/run.sh diff --git a/shell/run.sh b/shell/run.sh new file mode 100644 index 0000000..082690d --- /dev/null +++ b/shell/run.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +echo "run.sh" \ No newline at end of file From bf2fe3932ab804b6411f9b6fa7d84e27b414223a Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 05:08:00 +0800 Subject: [PATCH 08/14] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E7=9A=84echo=E8=AF=AD=E5=8F=A5=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=96=87=E4=BB=B6=E7=BB=93=E5=B0=BE=E6=8D=A2=E8=A1=8C?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 清理脚本中重复的echo命令并确保文件以换行符结尾 --- shell/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/run.sh b/shell/run.sh index 082690d..fecd1fa 100644 --- a/shell/run.sh +++ b/shell/run.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash +echo "run.sh" +echo "run.sh" echo "run.sh" \ No newline at end of file From bdb4d0ba822188a4286dee09dfb63b65432df181 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 05:22:54 +0800 Subject: [PATCH 09/14] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0run.sh=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E5=A4=8D=E8=BE=93=E5=87=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将重复的三行相同输出修改为带有编号的不同输出，提高脚本输出的可读性和调试便利性 --- shell/run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/run.sh b/shell/run.sh index fecd1fa..5324bc4 100644 --- a/shell/run.sh +++ b/shell/run.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -echo "run.sh" -echo "run.sh" -echo "run.sh" \ No newline at end of file +echo "run.sh 1" +echo "run.sh 2" +echo "run.sh 3" From c1633b4fc39f7b779eda90cc7bc2f045792735c4 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 05:47:08 +0800 Subject: [PATCH 10/14] =?UTF-8?q?feat:=20=E5=9C=A8=20run.sh=20=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AC=AC4=E4=B8=AA=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/run.sh b/shell/run.sh index 5324bc4..8e8658e 100644 --- a/shell/run.sh +++ b/shell/run.sh @@ -3,3 +3,4 @@ echo "run.sh 1" echo "run.sh 2" echo "run.sh 3" +echo "run.sh 4" From cd6fae93586b12e32fc29c86f0bacf11e6d21a72 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 05:52:10 +0800 Subject: [PATCH 11/14] =?UTF-8?q?feat:=20=E5=9C=A8run.sh=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AC=AC5=E3=80=816=E3=80=817=E8=A1=8C=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shell/run.sh b/shell/run.sh index 8e8658e..cdd1d79 100644 --- a/shell/run.sh +++ b/shell/run.sh @@ -4,3 +4,6 @@ echo "run.sh 1" echo "run.sh 2" echo "run.sh 3" echo "run.sh 4" +echo "run.sh 5" +echo "run.sh 6" +echo "run.sh 7" From 30e2ff7daa38d8482736b3b91155f380c3be4cfe Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 05:57:34 +0800 Subject: [PATCH 12/14] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0readme=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=B3=A8=E6=84=8F=E4=BA=8B=E9=A1=B9=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加关于脚本稳定性和自定义需求的注意事项，使文档更加清晰明确 --- readme.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 4fa5d18..0b28e3c 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,9 @@ # 说明文档 -自用的比较常规的 `docker-compose` 的 stack 脚本。 +自用的比较常规的 `docker-compose` 的 stack 脚本。 **开源只是为了分享，不保证任何的稳定性。请根据自己的需求进行修改。** +> 注意： +> 1. 该脚本只是一个简单的示例，不保证任何的稳定性。 +> 2. 请根据自己的需求进行修改。 From 2362e13ef02af5d1e6eda2b7f693c5be2ecd2889 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 06:41:48 +0800 Subject: [PATCH 13/14] =?UTF-8?q?fix(shell):=20=E6=9B=BF=E6=8D=A2run.sh?= =?UTF-8?q?=E4=B8=AD=E7=9A=84echo=E8=AF=AD=E5=8F=A5=E4=B8=BAgit=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加updatesh函数来处理git仓库更新，解决分支冲突问题 --- shell/run.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/shell/run.sh b/shell/run.sh index cdd1d79..74701ba 100644 --- a/shell/run.sh +++ b/shell/run.sh @@ -1,9 +1,16 @@ #!/usr/bin/env bash +#报错: +# hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches. + +#解决: +# git config pull.rebase false +updatesh() { + local dir=$1 + echo "update ${dir}" + cd ${dir} && git fetch --all && git reset --hard origin/main && git pull +} + +# 调用函数 +updatesh "/data/deploy.stack" + -echo "run.sh 1" -echo "run.sh 2" -echo "run.sh 3" -echo "run.sh 4" -echo "run.sh 5" -echo "run.sh 6" -echo "run.sh 7" From b6d501fdd92f572330b0ea2f762d71942813c1d0 Mon Sep 17 00:00:00 2001 From: cnphpbb Date: Thu, 31 Jul 2025 06:43:43 +0800 Subject: [PATCH 14/14] =?UTF-8?q?refactor(shell):=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=9B=BF=E6=8D=A2=E7=A1=AC=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改run.sh脚本，将硬编码的路径替换为参数传递，提高脚本的灵活性和可重用性 --- shell/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/run.sh b/shell/run.sh index 74701ba..7d20087 100644 --- a/shell/run.sh +++ b/shell/run.sh @@ -11,6 +11,6 @@ updatesh() { } # 调用函数 -updatesh "/data/deploy.stack" +updatesh $1