diff --git a/base/redis/valkey.stack.yml b/base/redis/valkey.stack.yml deleted file mode 100644 index 6b969a2..0000000 --- a/base/redis/valkey.stack.yml +++ /dev/null @@ -1,11 +0,0 @@ -# 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/builder/debian/env.cnf b/builder/debian/env.cnf index b5ddcb7..1ca3420 100644 --- a/builder/debian/env.cnf +++ b/builder/debian/env.cnf @@ -1 +1 @@ -IMAGE_TAG=debian:12 \ No newline at end of file +IMAGE_TAG=debian:13 \ No newline at end of file diff --git a/builder/golang/compose.yml b/builder/golang/compose.yml index 7bfd932..887dd8d 100644 --- a/builder/golang/compose.yml +++ b/builder/golang/compose.yml @@ -10,7 +10,7 @@ services: tty: true command: bash volumes: - - ${Volumes_Path}/mygits:/app + - ${Volumes_Path}/${PROJECT_NAME}:/app working_dir: /app environment: - GOPROXY=https://goproxy.cn,direct diff --git a/builder/golang/env.cnf b/builder/golang/env.cnf index 1c46af6..46ff4c2 100644 --- a/builder/golang/env.cnf +++ b/builder/golang/env.cnf @@ -1,5 +1,3 @@ -IMAGE_TAG_BASH=golang:1.23.5-bookworm -IMAGE_TAG_ASH=golang:1.23.5-alpine -#IMAGE_TAG_BASH=golang:1.22.11-bookworm -#IMAGE_TAG_ASH=golang:1.22.11-alpine +IMAGE_TAG_BASH=golang:1.25.0-trixie +IMAGE_TAG_ASH=golang:1.25.0-alpine Volumes_Path=/data/volumes \ No newline at end of file diff --git a/builder/nodejs/compose.yml b/builder/nodejs/compose.yml new file mode 100644 index 0000000..2c23976 --- /dev/null +++ b/builder/nodejs/compose.yml @@ -0,0 +1,13 @@ +# run:: docker compose -p memos --env-file ./builder/nodejs/env.cfg -f ./builder/nodejs/compose.yml up -d + +services: + + golang: + image: ${IMAGE_TAG_BASH} + container_name: "build-nodejs" + restart: always + tty: true + command: bash + volumes: + - ${Volumes_Path}/${PROJECT_NAME}:/app + working_dir: /app \ No newline at end of file diff --git a/builder/nodejs/env.cfg b/builder/nodejs/env.cfg new file mode 100644 index 0000000..a80b127 --- /dev/null +++ b/builder/nodejs/env.cfg @@ -0,0 +1,3 @@ +IMAGE_TAG_BASH=node:22.18.0-bookworm +IMAGE_TAG_ASH=node:22.18.0-alpine +Volumes_Path=/data/volumes \ No newline at end of file diff --git a/dbSer/mysql/env.cfg b/dbSer/mysql/env.cfg index 53047d1..b1b4e4d 100644 --- a/dbSer/mysql/env.cfg +++ b/dbSer/mysql/env.cfg @@ -1,5 +1,6 @@ -IMAGE_TAG=mysql:8.4.5 -IMAGE_TAG_V9=mysql:9.3.0 -IMAGE_TAG_V8=mysql:8.0.42 -IMAGE_TAG_LTS=mysql:8.4.5 -MYSQL_ROOT_PASSWORD=Kevin%0412%Mysql \ No newline at end of file +# 密码为生成的密码,请使用时修改后再部署 +IMAGE_TAG=mysql:8.4.6 +IMAGE_TAG_V9=mysql:9.4.0 +IMAGE_TAG_V8=mysql:8.0.43 +IMAGE_TAG_LTS=mysql:8.4.6 +MYSQL_ROOT_PASSWORD=fwoK7vbXMuavrUuX6Q \ No newline at end of file diff --git a/dbSer/mysql/prod.stack.yml b/dbSer/mysql/prod.stack.yml index 5b3ab28..fdfb538 100644 --- a/dbSer/mysql/prod.stack.yml +++ b/dbSer/mysql/prod.stack.yml @@ -1,9 +1,9 @@ # Pull:: docker compose --env-file ./dbSer/mysql/env.cfg -f ./dbSer/mysql/prod.stack.yml pull -# Run:: docker compose -p dbSer --env-file ./dbSer/mysql/env.cfg -f ./dbSer/mysql/prod.stack.yml up -d +# Run:: docker compose -p mysql --env-file ./dbSer/mysql/env.cfg -f ./dbSer/mysql/prod.stack.yml up -d services: mysql: - image: ${IMAGE_TAG_LTS} + image: ${IMAGE_TAG_V9} container_name: prod-mysql restart: always environment: @@ -15,8 +15,8 @@ services: - /etc/localtime:/etc/localtime:ro ports: - "3306:3306" - command: - #command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --default-authentication-plugin=mysql_native_password + #command: + command: --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci volumes: mysql_data: diff --git a/dbSer/postgres/env.cfg b/dbSer/postgres/env.cfg index 390a953..0b41a19 100644 --- a/dbSer/postgres/env.cfg +++ b/dbSer/postgres/env.cfg @@ -1,7 +1,8 @@ +# 密码为生成的密码,请使用时修改后再部署 #IMAGE_TAG=postgres:14.11-bookworm #IMAGE_TAG=postgres:15.6-bookworm -IMAGE_TAG=postgres:16.8 -IMAGE_TAG_V17=postgres:17.4 -IMAGE_TAG_V15=postgres:15.12 -POSTGRES_PASSWORD=Kevin0412PgSql +IMAGE_TAG=postgres:16.10 +IMAGE_TAG_V17=postgres:17.6 +IMAGE_TAG_V15=postgres:15.14 +POSTGRES_PASSWORD=AGC4eGx2aq8rSiZXBP POSTGRES_HOST_AUTH_METHOD=scram-sha-256 \ No newline at end of file diff --git a/base/redis/env.cfg b/dbSer/redis/env.cfg similarity index 87% rename from base/redis/env.cfg rename to dbSer/redis/env.cfg index 0c4fdc9..678f811 100644 --- a/base/redis/env.cfg +++ b/dbSer/redis/env.cfg @@ -4,3 +4,4 @@ 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 +REDIS_PASSWORD=AGC4eGx2aq8rSiZXBP diff --git a/base/redis/redis.stack.yml b/dbSer/redis/redis.stack.yml similarity index 100% rename from base/redis/redis.stack.yml rename to dbSer/redis/redis.stack.yml diff --git a/dbSer/redis/valkey.stack.yml b/dbSer/redis/valkey.stack.yml new file mode 100644 index 0000000..f06dc53 --- /dev/null +++ b/dbSer/redis/valkey.stack.yml @@ -0,0 +1,11 @@ +# Pull: docker compose -p valkey --env-file ./dbSer/redis/env.cfg -f ./dbSer/redis/valkey.stack.yml pull + +# Run:: docker compose -p valkey --env-file ./dbSer/redis/env.cfg -f ./dbSer/redis/valkey.stack.yml up -d +services: + redis: + image: ${IMAGE_TAG_VALKEYV8} + ports: + - '6379:6379' + command: valkey-server --appendonly yes --requirepass ${REDIS_PASSWORD} + volumes: + - '${Volumes_PATH}/redis:/data' \ No newline at end of file diff --git a/gitea/env.cfg b/gitea/env.cfg index 09c6bca..b93e5bf 100644 --- a/gitea/env.cfg +++ b/gitea/env.cfg @@ -1,4 +1,4 @@ -IMAGE_TAG=gitea/gitea:1.24.3-rootless +IMAGE_TAG=gitea/gitea:1.24.5-rootless Volumes_PATH=/data/volumes/gitea LAY_SSH_HOST_PORT=22 SSH_HOST_PORT=2222 \ No newline at end of file diff --git a/portainer-ce/env.cfg b/portainer-ce/env.cfg index e75c805..43b3ec8 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.9 -AGENT_TAG=portainer/agent:2.27.9 +IMAGE_TAG=portainer/portainer-ce:2.32.0 +AGENT_TAG=portainer/agent:2.32.0 diff --git a/webout/myproxy.yml b/webout/myproxy.yml new file mode 100644 index 0000000..fc3cbcd --- /dev/null +++ b/webout/myproxy.yml @@ -0,0 +1,19 @@ +# run:: docker compose -p out-caddy --env-file ./webout/env.cfg -f ./webout/myproxy.yml up -d + +services: + web-out: + image: ${IMAGE_TAG} + volumes: + - caddy_data:/data + - caddy_config:/config + - /data/configs/caddy/myproxy.conf:/etc/caddy/Caddyfile + ports: + - '8080:80' + container_name: web-out + restart: unless-stopped + environment: + - TZ=Asia/Shanghai + +volumes: + caddy_data: + caddy_config: \ No newline at end of file