From 8b97c02d1515049957c19119052b981b07ae4541 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Mon, 29 Jul 2024 11:15:44 +0800
Subject: [PATCH] =?UTF-8?q?:whale:=20=E4=BF=AE=E6=94=B9=20docker=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose-testing.yml | 24 ++++++++++++------------
 docker-compose.yml         | 27 ++++++++++++++++-----------
 docker/adminer/Dockerfile  |  1 +
 docker/adminer/build.sh    |  5 +++++
 4 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 docker/adminer/Dockerfile
 create mode 100644 docker/adminer/build.sh

diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml
index 6de1a7de..f1b0df23 100644
--- a/docker-compose-testing.yml
+++ b/docker-compose-testing.yml
@@ -1,17 +1,17 @@
 version: '3.3'
 services:
-  orion-visor-service:
+  service:
     image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
     privileged: true
     ports:
       - 1081:80
     environment:
-      - MYSQL_HOST=orion-visor-mysql
+      - MYSQL_HOST=mysql
       - MYSQL_PORT=3306
       - MYSQL_DATABASE=orion_visor
       - MYSQL_USER=root
       - MYSQL_PASSWORD=Data@123456
-      - REDIS_HOST=orion-visor-redis
+      - REDIS_HOST=redis
       - REDIS_PASSWORD=Data@123456
       - SECRET_KEY=uQeacXV8b3isvKLK
       - DEMO_MODE=false
@@ -24,14 +24,14 @@ services:
       retries: 200
       start_period: 3s
     depends_on:
-      orion-visor-mysql:
+      mysql:
         condition: service_healthy
-      orion-visor-redis:
+      redis:
         condition: service_healthy
     links:
-      - orion-visor-mysql
-      - orion-visor-redis
-  orion-visor-mysql:
+      - mysql
+      - redis
+  mysql:
     image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
     privileged: true
     ports:
@@ -51,7 +51,7 @@ services:
       timeout: 60s
       retries: 10
       start_period: 3s
-  orion-visor-redis:
+  redis:
     image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
     privileged: true
     ports:
@@ -71,9 +71,9 @@ services:
     build:
       context: ./docker/e2e
     environment:
-      SERVER: http://orion-visor-service:80
+      SERVER: http://service:80
     depends_on:
-      orion-visor-service:
+      service:
         condition: service_healthy
     links:
-      - orion-visor-service
+      - service
diff --git a/docker-compose.yml b/docker-compose.yml
index 2177ca34..be588b1c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,17 @@
 version: '3.3'
 services:
-  orion-visor-service:
+  service:
     image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
     privileged: true
     ports:
       - 1081:80
     environment:
-      - MYSQL_HOST=orion-visor-mysql
+      - MYSQL_HOST=mysql
       - MYSQL_PORT=3306
       - MYSQL_DATABASE=orion_visor
       - MYSQL_USER=root
       - MYSQL_PASSWORD=Data@123456
-      - REDIS_HOST=orion-visor-redis
+      - REDIS_HOST=redis
       - REDIS_PASSWORD=Data@123456
       - SECRET_KEY=uQeacXV8b3isvKLK
       - DEMO_MODE=false
@@ -24,14 +24,14 @@ services:
       retries: 200
       start_period: 3s
     depends_on:
-      orion-visor-mysql:
+      mysql:
         condition: service_healthy
-      orion-visor-redis:
+      redis:
         condition: service_healthy
     links:
-      - orion-visor-mysql
-      - orion-visor-redis
-  orion-visor-mysql:
+      - mysql
+      - redis
+  mysql:
     image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
     privileged: true
     ports:
@@ -51,7 +51,7 @@ services:
       timeout: 60s
       retries: 10
       start_period: 3s
-  orion-visor-redis:
+  redis:
     image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
     privileged: true
     ports:
@@ -67,7 +67,12 @@ services:
       timeout: 60s
       retries: 10
       start_period: 3s
-  orion-visor-adminer:
-    image: adminer
+  adminer:
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.2
     ports:
       - 8081:8080
+    depends_on:
+      mysql:
+        condition: service_healthy
+    links:
+      - mysql
diff --git a/docker/adminer/Dockerfile b/docker/adminer/Dockerfile
new file mode 100644
index 00000000..9ee4d40b
--- /dev/null
+++ b/docker/adminer/Dockerfile
@@ -0,0 +1 @@
+FROM adminer:latest
diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
new file mode 100644
index 00000000..bc1a13ef
--- /dev/null
+++ b/docker/adminer/build.sh
@@ -0,0 +1,5 @@
+#/bin/bash
+version=2.1.2
+docker build -t orion-visor-adminer:${version} .
+docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
+docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}