manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐳 修改 docker 配置.

Browse Source
This commit is contained in:
lijiahang
2024-07-29 11:15:44 +08:00
parent dcfb016ce5
commit 8b97c02d15
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docker-compose-testing.yml
View File

@@ -1,17 +1,17 @@
version: '3.3' version: '3.3'
services: services:
orion-visor-service: service:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
privileged: true privileged: true
ports: ports:
- 1081:80 - 1081:80
environment: environment:
- MYSQL_HOST=orion-visor-mysql - MYSQL_HOST=mysql
- MYSQL_PORT=3306 - MYSQL_PORT=3306
- MYSQL_DATABASE=orion_visor - MYSQL_DATABASE=orion_visor
- MYSQL_USER=root - MYSQL_USER=root
- MYSQL_PASSWORD=Data@123456 - MYSQL_PASSWORD=Data@123456
- REDIS_HOST=orion-visor-redis - REDIS_HOST=redis
- REDIS_PASSWORD=Data@123456 - REDIS_PASSWORD=Data@123456
- SECRET_KEY=uQeacXV8b3isvKLK - SECRET_KEY=uQeacXV8b3isvKLK
- DEMO_MODE=false - DEMO_MODE=false
@@ -24,14 +24,14 @@ services:
retries: 200 retries: 200
start_period: 3s start_period: 3s
depends_on: depends_on:
orion-visor-mysql: mysql:
condition: service_healthy condition: service_healthy
orion-visor-redis: redis:
condition: service_healthy condition: service_healthy
links: links:
- orion-visor-mysql - mysql
- orion-visor-redis - redis
orion-visor-mysql: mysql:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
privileged: true privileged: true
ports: ports:
@@ -51,7 +51,7 @@ services:
timeout: 60s timeout: 60s
retries: 10 retries: 10
start_period: 3s start_period: 3s
orion-visor-redis: redis:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
privileged: true privileged: true
ports: ports:
@@ -71,9 +71,9 @@ services:
build: build:
context: ./docker/e2e context: ./docker/e2e
environment: environment:
SERVER: http://orion-visor-service:80 SERVER: http://service:80
depends_on: depends_on:
orion-visor-service: service:
condition: service_healthy condition: service_healthy
links: links:
- orion-visor-service - service

27
docker-compose.yml
View File

@@ -1,17 +1,17 @@
version: '3.3' version: '3.3'
services: services:
orion-visor-service: service:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.2
privileged: true privileged: true
ports: ports:
- 1081:80 - 1081:80
environment: environment:
- MYSQL_HOST=orion-visor-mysql - MYSQL_HOST=mysql
- MYSQL_PORT=3306 - MYSQL_PORT=3306
- MYSQL_DATABASE=orion_visor - MYSQL_DATABASE=orion_visor
- MYSQL_USER=root - MYSQL_USER=root
- MYSQL_PASSWORD=Data@123456 - MYSQL_PASSWORD=Data@123456
- REDIS_HOST=orion-visor-redis - REDIS_HOST=redis
- REDIS_PASSWORD=Data@123456 - REDIS_PASSWORD=Data@123456
- SECRET_KEY=uQeacXV8b3isvKLK - SECRET_KEY=uQeacXV8b3isvKLK
- DEMO_MODE=false - DEMO_MODE=false
@@ -24,14 +24,14 @@ services:
retries: 200 retries: 200
start_period: 3s start_period: 3s
depends_on: depends_on:
orion-visor-mysql: mysql:
condition: service_healthy condition: service_healthy
orion-visor-redis: redis:
condition: service_healthy condition: service_healthy
links: links:
- orion-visor-mysql - mysql
- orion-visor-redis - redis
orion-visor-mysql: mysql:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.2
privileged: true privileged: true
ports: ports:
@@ -51,7 +51,7 @@ services:
timeout: 60s timeout: 60s
retries: 10 retries: 10
start_period: 3s start_period: 3s
orion-visor-redis: redis:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.2
privileged: true privileged: true
ports: ports:
@@ -67,7 +67,12 @@ services:
timeout: 60s timeout: 60s
retries: 10 retries: 10
start_period: 3s start_period: 3s
orion-visor-adminer: adminer:
image: adminer image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.2
ports: ports:
- 8081:8080 - 8081:8080
depends_on:
mysql:
condition: service_healthy
links:
- mysql

1
docker/adminer/Dockerfile Normal file
View File

@@ -0,0 +1 @@
FROM adminer:latest

5
docker/adminer/build.sh Normal file
View File

@@ -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}