diff --git a/dev-dbs/config.conf b/dbSer/config.conf similarity index 100% rename from dev-dbs/config.conf rename to dbSer/config.conf diff --git a/dev-dbs/dbs-dev.stack.yaml b/dbSer/dbs-dev.stack.yaml similarity index 96% rename from dev-dbs/dbs-dev.stack.yaml rename to dbSer/dbs-dev.stack.yaml index 400f86c..4524966 100644 --- a/dev-dbs/dbs-dev.stack.yaml +++ b/dbSer/dbs-dev.stack.yaml @@ -1,4 +1,4 @@ -# docker compose -p dbs -f ./dev-dbs/dbs-dev.stack.yaml up -d +# docker compose -p dbs -f ./dbSer/dbs-dev.stack.yaml up -d version: "3.8" services: diff --git a/dev-dbs/dbs.networks.set.yml b/dbSer/dbs.networks.set.yml similarity index 100% rename from dev-dbs/dbs.networks.set.yml rename to dbSer/dbs.networks.set.yml diff --git a/dev-dbs/dbs.stack.yaml b/dbSer/dbs.stack.yaml similarity index 100% rename from dev-dbs/dbs.stack.yaml rename to dbSer/dbs.stack.yaml diff --git a/dev-dbs/etcd.yml b/dbSer/etcd.yml similarity index 100% rename from dev-dbs/etcd.yml rename to dbSer/etcd.yml diff --git a/dev-dbs/mongo.yml b/dbSer/mongo.yml similarity index 100% rename from dev-dbs/mongo.yml rename to dbSer/mongo.yml diff --git a/dev-dbs/mysql/env.cfg b/dbSer/mysql/env.cfg similarity index 100% rename from dev-dbs/mysql/env.cfg rename to dbSer/mysql/env.cfg diff --git a/dev-dbs/mysql/stack.yml b/dbSer/mysql/stack.yml similarity index 66% rename from dev-dbs/mysql/stack.yml rename to dbSer/mysql/stack.yml index 6a1c73b..f0c233f 100644 --- a/dev-dbs/mysql/stack.yml +++ b/dbSer/mysql/stack.yml @@ -1,5 +1,5 @@ -# Pull:: docker compose --env-file ./dev-dbs/mysql/env.cfg -f ./dev-dbs/mysql/stack.yml pull -# Run:: docker compose -p dev-dbs --env-file ./dev-dbs/mysql/env.cfg -f ./dev-dbs/mysql/stack.yml up -d +# 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 services: mysql: diff --git a/dev-dbs/percona.yml b/dbSer/percona.yml similarity index 100% rename from dev-dbs/percona.yml rename to dbSer/percona.yml diff --git a/dev-dbs/postgres.yml b/dbSer/postgres.yml similarity index 72% rename from dev-dbs/postgres.yml rename to dbSer/postgres.yml index 42f9936..25627a3 100644 --- a/dev-dbs/postgres.yml +++ b/dbSer/postgres.yml @@ -1,5 +1,5 @@ -# docker compose -p dbs -f ./dev-dbs/dbs.networks.set.yml -f ./dev-dbs/postgres.yml pull -# docker compose -p dbs -f ./dev-dbs/dbs.networks.set.yml -f ./dev-dbs/postgres.yml up -d +# docker compose -p dbs -f ./dbSer/dbs.networks.set.yml -f ./dbSer/postgres.yml pull +# docker compose -p dbs -f ./dbSer/dbs.networks.set.yml -f ./dbSer/postgres.yml up -d services: postgres: diff --git a/dev-dbs/postgres/env.cfg b/dbSer/postgres/env.cfg similarity index 100% rename from dev-dbs/postgres/env.cfg rename to dbSer/postgres/env.cfg diff --git a/dev-dbs/postgres/prod.stack.yml b/dbSer/postgres/prod.stack.yml similarity index 71% rename from dev-dbs/postgres/prod.stack.yml rename to dbSer/postgres/prod.stack.yml index 389733c..2d7963b 100644 --- a/dev-dbs/postgres/prod.stack.yml +++ b/dbSer/postgres/prod.stack.yml @@ -1,6 +1,6 @@ #mkdir -pv /data/volumes/postgres/data -#pull:: docker compose --env-file ./dev-dbs/postgres/env.cfg -f ./dev-dbs/postgres/prod.stack.yml pull -#run:: docker compose -p prod-dbs --env-file ./dev-dbs/postgres/env.cfg -f ./dev-dbs/postgres/prod.stack.yml up -d +#pull:: docker compose --env-file ./dbSer/postgres/env.cfg -f ./dbSer/postgres/prod.stack.yml pull +#run:: docker compose -p prod-dbs --env-file ./dbSer/postgres/env.cfg -f ./dbSer/postgres/prod.stack.yml up -d services: postgres: diff --git a/dev-dbs/postgres/test.stack.yml b/dbSer/postgres/test.stack.yml similarity index 69% rename from dev-dbs/postgres/test.stack.yml rename to dbSer/postgres/test.stack.yml index a481bc1..a11f395 100644 --- a/dev-dbs/postgres/test.stack.yml +++ b/dbSer/postgres/test.stack.yml @@ -1,5 +1,5 @@ -#pull:: docker compose --env-file ./dev-dbs/postgres/env.cfg -f ./dev-dbs/postgres/test.stack.yml pull -#run:: docker compose -p test-dbs --env-file ./dev-dbs/postgres/env.cfg -f ./dev-dbs/postgres/test.stack.yml up -d +#pull:: docker compose --env-file ./dbSer/postgres/env.cfg -f ./dbSer/postgres/test.stack.yml pull +#run:: docker compose -p test-dbs --env-file ./dbSer/postgres/env.cfg -f ./dbSer/postgres/test.stack.yml up -d services: diff --git a/dev-dbs/redis.yml b/dbSer/redis.yml similarity index 100% rename from dev-dbs/redis.yml rename to dbSer/redis.yml diff --git a/gitea/stack.yml b/gitea/stack.yml index ddf0a0b..fbb41f0 100644 --- a/gitea/stack.yml +++ b/gitea/stack.yml @@ -1,8 +1,8 @@ # mkdir -pv gitea/{data,config} # cd gitea # chown 1000:1000 config/ data/ -# pull:: docker compose --env-file ./gitea/env.cfg -f ./gitea/stack.yml pull -# Run:: docker compose -p gitea --env-file ./gitea/env.cfg -f ./gitea/stack.yml up -d +# pull:: docker compose --env-file ./gitea/env.cfg -f ./gitea/prod.stack.yml pull +# Run:: docker compose -p gitea --env-file ./gitea/env.cfg -f ./gitea/prod.stack.yml up -d version: "3.9" services: @@ -19,6 +19,7 @@ services: - ${Volumes_PATH}/config:/etc/gitea - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + - TZ=Asia/Shanghai ports: - 3000:3000 - 2222:2222 diff --git a/memos/stack.yml b/memos/stack.yml index 58b21cf..eb65618 100644 --- a/memos/stack.yml +++ b/memos/stack.yml @@ -1,5 +1,5 @@ # path:: mkdir -pv /data/volumes/memos/data -# run:: docker compose -p memos --env-file ./memos/env.cfg -f ./memos/stack.yml up -d +# run:: docker compose -p memos --env-file ./memos/env.cfg -f ./memos/prod.stack.yml up -d services: memos: