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 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 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 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/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 diff --git a/readme.md b/readme.md index 78b19c9..0b28e3c 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,9 @@ # 说明文档 -自用的比较常规的 `docker-compose` 的 stack 脚本。 +自用的比较常规的 `docker-compose` 的 stack 脚本。 +**开源只是为了分享,不保证任何的稳定性。请根据自己的需求进行修改。** + +> 注意: +> 1. 该脚本只是一个简单的示例,不保证任何的稳定性。 +> 2. 请根据自己的需求进行修改。 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 diff --git a/shell/run.sh b/shell/run.sh new file mode 100644 index 0000000..7d20087 --- /dev/null +++ b/shell/run.sh @@ -0,0 +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 $1 + +