From 5d289eb39598c6d061a7c7b046724f3e931d76d0 Mon Sep 17 00:00:00 2001
From: GengY <geng@gunn.lan>
Date: Tue, 5 Mar 2024 08:52:26 +0800
Subject: [PATCH] modify(dev-dbs): modify env name

---
 dev-dbs/mysql/env.cfg      |  1 +
 dev-dbs/mysql/stack.yml    | 21 +++++++++++++++++++++
 dev-dbs/percona.yml        |  8 ++++----
 dev-dbs/postgres.yml       |  3 ++-
 dev-dbs/postgres/env.cfg   |  3 +++
 dev-dbs/postgres/stack.yml | 20 ++++++++++++++++++++
 6 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 dev-dbs/mysql/env.cfg
 create mode 100644 dev-dbs/mysql/stack.yml
 create mode 100644 dev-dbs/postgres/env.cfg
 create mode 100644 dev-dbs/postgres/stack.yml

diff --git a/dev-dbs/mysql/env.cfg b/dev-dbs/mysql/env.cfg
new file mode 100644
index 0000000..2941006
--- /dev/null
+++ b/dev-dbs/mysql/env.cfg
@@ -0,0 +1 @@
+IMAGE_TAG=mysql:8.3.0
\ No newline at end of file
diff --git a/dev-dbs/mysql/stack.yml b/dev-dbs/mysql/stack.yml
new file mode 100644
index 0000000..6a1c73b
--- /dev/null
+++ b/dev-dbs/mysql/stack.yml
@@ -0,0 +1,21 @@
+# 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
+
+services:
+  mysql:
+    image: mysql:8.3.0
+    container_name: Dev-mysql
+    restart: always
+    environment:
+      - MYSQL_ROOT_PASSWORD=Kevin%0412%Mysql
+      - TZ=Asia/Shanghai
+    volumes:
+      - mysql_data:/var/lib/mysql
+      - mysql_logs:/var/log/mysql
+    ports:
+      - "3306:3306"
+    command: --default-authentication-plugin=mysql_native_password
+
+volumes:
+  mysql_data:
+  mysql_logs:
diff --git a/dev-dbs/percona.yml b/dev-dbs/percona.yml
index e731cdd..6244d56 100644
--- a/dev-dbs/percona.yml
+++ b/dev-dbs/percona.yml
@@ -6,8 +6,8 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=Kevin#0412&Mysql
     volumes:
-      - mysql_data:/var/lib/mysql
-      - mysql_logs:/var/log/mysql
+      - percona_data:/var/lib/mysql
+      - percona_logs:/var/log/mysql
     ports:
       - "3306:3306"
     networks:
@@ -15,5 +15,5 @@ services:
         ipv4_address: 172.22.10.206
 
 volumes:
-  mysql_data:
-  mysql_logs:
\ No newline at end of file
+  percona_data:
+  percona_logs:
\ No newline at end of file
diff --git a/dev-dbs/postgres.yml b/dev-dbs/postgres.yml
index d9deac4..42f9936 100644
--- a/dev-dbs/postgres.yml
+++ b/dev-dbs/postgres.yml
@@ -7,9 +7,10 @@ services:
     container_name: Dev-postgre
     restart: always
     environment:
-      - POSTGRES_PASSWORD=Kevin%0412&PGSql
+      - POSTGRES_PASSWORD=Kevin%0412
       - POSTGRES_HOST_AUTH_METHOD=scram-sha-256
       - POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256
+      - TZ=Asia/Shanghai
     volumes:
       - postgresql_data:/var/lib/postgresql/data
     ports:
diff --git a/dev-dbs/postgres/env.cfg b/dev-dbs/postgres/env.cfg
new file mode 100644
index 0000000..d9eb097
--- /dev/null
+++ b/dev-dbs/postgres/env.cfg
@@ -0,0 +1,3 @@
+#IMAGE_TAG=postgres:14.11-bookworm
+#IMAGE_TAG=postgres:15.6-bookworm
+IMAGE_TAG=postgres:16.2-bookworm
\ No newline at end of file
diff --git a/dev-dbs/postgres/stack.yml b/dev-dbs/postgres/stack.yml
new file mode 100644
index 0000000..b0d63b3
--- /dev/null
+++ b/dev-dbs/postgres/stack.yml
@@ -0,0 +1,20 @@
+#pull:: docker compose --env-file ./dev-dbs/postgres/env.cfg -f ./dev-dbs/postgres/stack.yml pull
+#run::  docker compose -p dev-dbs  --env-file ./dev-dbs/postgres/env.cfg -f ./dev-dbs/postgres/stack.yml up -d
+services:
+
+  postgres:
+    image: ${IMAGE_TAG}
+    container_name: Dev-postgre
+    restart: always
+    environment:
+      - POSTGRES_PASSWORD=Kevin0412PgSql
+      - POSTGRES_HOST_AUTH_METHOD=scram-sha-256
+      - POSTGRES_INITDB_ARGS=--auth-host=scram-sha-256
+      - TZ=Asia/Shanghai
+    volumes:
+      - postgresql_data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+
+volumes:
+  postgresql_data:
\ No newline at end of file