Browse Source

Merge pull request #991 from colinin/fix-docker-env-configuration

fix(docker): 修复docker环境配置错误
pull/1010/head
yx lin 1 year ago
committed by GitHub
parent
commit
e26a613657
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 10
      docker-compose.override.configuration.yml
  2. 22
      docker-compose.yml

10
docker-compose.override.configuration.yml

@ -24,6 +24,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -80,6 +81,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -133,6 +135,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -189,6 +192,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -242,6 +246,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- RemoteServices__AbpIdentity__BaseUrl=http://apigateway:30000/ - RemoteServices__AbpIdentity__BaseUrl=http://apigateway:30000/
- RemoteServices__AbpIdentity__IdentityClient=InternalServiceClient - RemoteServices__AbpIdentity__IdentityClient=InternalServiceClient
- IdentityClients__InternalServiceClient__Authority=http://auth-server:44385/ - IdentityClients__InternalServiceClient__Authority=http://auth-server:44385/
@ -305,6 +310,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -360,6 +366,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -413,6 +420,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -466,6 +474,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#
@ -529,6 +538,7 @@ services:
- ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456 - ConnectionStrings__Workflow=Server=host.docker.internal;Database=Workflow-V70;User Id=root;Password=123456
- ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__Notifications=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456 - ConnectionStrings__MessageService=Server=host.docker.internal;Database=Messages-V70;User Id=root;Password=123456
- ConnectionStrings__AppPlatform=Server=host.docker.internal;Database=Platform-V70;User Id=root;Password=123456
- Encryption__PassPhrase=s46c5q55nxpeS8Ra - Encryption__PassPhrase=s46c5q55nxpeS8Ra
- Encryption__InitVector=s83ng0abvd02js84 - Encryption__InitVector=s83ng0abvd02js84
- Encryption__Salt=sf&5)s3# - Encryption__Salt=sf&5)s3#

22
docker-compose.yml

@ -5,7 +5,7 @@ services:
hostname: admin-api hostname: admin-api
container_name: admin-api container_name: admin-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -25,7 +25,7 @@ services:
hostname: auth-server-api hostname: auth-server-api
container_name: auth-server-api container_name: auth-server-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -45,7 +45,7 @@ services:
hostname: localization-api hostname: localization-api
container_name: localization-api container_name: localization-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -65,7 +65,7 @@ services:
hostname: platform-api hostname: platform-api
container_name: platform-api container_name: platform-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -85,7 +85,7 @@ services:
hostname: messages-api hostname: messages-api
container_name: messages-api container_name: messages-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -105,7 +105,7 @@ services:
hostname: tasks-api hostname: tasks-api
container_name: tasks-api container_name: tasks-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -125,7 +125,7 @@ services:
hostname: webhooks-api hostname: webhooks-api
container_name: webhooks-api container_name: webhooks-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -145,7 +145,7 @@ services:
hostname: workflow-api hostname: workflow-api
container_name: workflow-api container_name: workflow-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -165,7 +165,7 @@ services:
hostname: wechat-api hostname: wechat-api
container_name: wechat-api container_name: wechat-api
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -185,7 +185,7 @@ services:
hostname: auth-server hostname: auth-server
container_name: auth-server container_name: auth-server
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:
@ -205,7 +205,7 @@ services:
hostname: apigateway hostname: apigateway
container_name: apigateway container_name: apigateway
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Development
- ASPNETCORE_HTTP_PORTS=80 - ASPNETCORE_HTTP_PORTS=80
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
ports: ports:

Loading…
Cancel
Save