diff --git a/docker-compose.agile.config.yml b/docker-compose.agile.config.yml index 72864443d..295226ea3 100644 --- a/docker-compose.agile.config.yml +++ b/docker-compose.agile.config.yml @@ -1,15 +1,29 @@ version: '3.4' services: + agile-config: + image: kklldog/agile_config:latest + environment: + - adminConsole=true + - db:provider=mysql + - db:conn=Server=127.0.0.1;Database=agile;User Id=root;Password=123456;Character Set=utf8mb4 + ports: + - "5000:5000" + volumes: + - /etc/localtime:/etc/localtime + restart: always + sts-server: environment: - AgileConfig__IsEnabled=true - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.AuthServer - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=AuthServer - AgileConfig__tag=AuthServer + depends_on: + - agile-config sts-api: environment: @@ -17,9 +31,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.IdentityServer.Admin - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=IdentityServer.Admin - AgileConfig__tag=IdentityServer.Admin + depends_on: + - agile-config admin-api: environment: @@ -27,9 +43,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Backend.Admin - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=BackendAdmin - AgileConfig__tag=BackendAdmin + depends_on: + - agile-config localization-api: environment: @@ -37,9 +55,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Localization - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Localization - AgileConfig__tag=Localization + depends_on: + - agile-config platform-api: environment: @@ -47,9 +67,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Platform - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Platform - AgileConfig__tag=Platform + depends_on: + - agile-config messages-api: environment: @@ -57,9 +79,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Message - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Message - AgileConfig__tag=Message + depends_on: + - agile-config task-api: environment: @@ -67,9 +91,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Task - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Task - AgileConfig__tag=Task + depends_on: + - agile-config webhook-api: environment: @@ -77,9 +103,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Webhooks - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Webhooks - AgileConfig__tag=Webhooks + depends_on: + - agile-config workflow-api: environment: @@ -87,9 +115,11 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Abp.Workflow - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=Workflow - AgileConfig__tag=Workflow + depends_on: + - agile-config internal-apigateway: environment: @@ -97,6 +127,8 @@ services: - AgileConfig__env=DEV - AgileConfig__appId=LINGYUN.Internal.ApiGateway - AgileConfig__secret=1q2w3E* - - AgileConfig__nodes=http://docker.gzbit.cn:5000 + - AgileConfig__nodes=http://agile-config:5000 - AgileConfig__name=ApiGateway - AgileConfig__tag=ApiGateway + depends_on: + - agile-config diff --git a/docker-compose.override.windows.yml b/docker-compose.override.windows.yml index 2c739447e..29f7e405e 100644 --- a/docker-compose.override.windows.yml +++ b/docker-compose.override.windows.yml @@ -5,8 +5,8 @@ services: build: context: ./aspnet-core/services/Publish/identityserver volumes: - - D:\Project\Abp\logs\ids-sts:/app/Logs - - D:\Project\Abp\data\ids-sts\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\ids-sts:/app/Logs + - D:\Projects\Development\Abp\Application\data\ids-sts\Modules:/app/Modules networks: - framework @@ -14,8 +14,8 @@ services: build: context: ./aspnet-core/services/Publish/identityserver4-admin volumes: - - D:\Project\Abp\logs\ids-admin:/app/Logs - - D:\Project\Abp\data\ids-admin\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\ids-admin:/app/Logs + - D:\Projects\Development\Abp\Application\data\ids-admin\Modules:/app/Modules depends_on: - sts-server networks: @@ -25,8 +25,8 @@ services: build: context: ./aspnet-core/services/Publish/admin volumes: - - D:\Project\Abp\logs\backend-admin:/app/Logs - - D:\Project\Abp\data\backend-admin\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\backend-admin:/app/Logs + - D:\Projects\Development\Abp\Application\data\backend-admin\Modules:/app/Modules depends_on: - sts-server networks: @@ -36,8 +36,8 @@ services: build: context: ./aspnet-core/services/Publish/localization volumes: - - D:\Project\Abp\logs\localization:/app/Logs - - D:\Project\Abp\data\localization\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\localization:/app/Logs + - D:\Projects\Development\Abp\Application\data\localization\Modules:/app/Modules depends_on: - sts-server networks: @@ -47,9 +47,9 @@ services: build: context: ./aspnet-core/services/Publish/platform volumes: - - D:\Project\Abp\logs\platform:/app/Logs - - D:\Project\Abp\data\platform\Modules:/app/Modules - - D:\Project\Abp\data\platform:/app/file-blob-storing + - D:\Projects\Development\Abp\Application\logs\platform:/app/Logs + - D:\Projects\Development\Abp\Application\data\platform\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\data\platform:/app/file-blob-storing depends_on: - sts-server networks: @@ -59,8 +59,8 @@ services: build: context: ./aspnet-core/services/Publish/messages volumes: - - D:\Project\Abp\logs\messages:/app/Logs - - D:\Project\Abp\data\messages\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\messages:/app/Logs + - D:\Projects\Development\Abp\Application\data\messages\Modules:/app/Modules depends_on: - sts-server networks: @@ -70,8 +70,8 @@ services: build: context: ./aspnet-core/services/Publish/task-management volumes: - - D:\Project\Abp\logs\task-management:/app/Logs - - D:\Project\Abp\data\task-management\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\task-management:/app/Logs + - D:\Projects\Development\Abp\Application\data\task-management\Modules:/app/Modules depends_on: - sts-server networks: @@ -81,8 +81,8 @@ services: build: context: ./aspnet-core/services/Publish/webhooks volumes: - - D:\Project\Abp\logs\webhooks:/app/Logs - - D:\Project\Abp\data\webhooks\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\webhooks:/app/Logs + - D:\Projects\Development\Abp\Application\data\webhooks\Modules:/app/Modules depends_on: - sts-server networks: @@ -92,8 +92,8 @@ services: build: context: ./aspnet-core/services/Publish/workflow volumes: - - D:\Project\Abp\logs\workflow:/app/Logs - - D:\Project\Abp\data\workflow\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\workflow:/app/Logs + - D:\Projects\Development\Abp\Application\data\workflow\Modules:/app/Modules depends_on: - sts-server networks: @@ -103,12 +103,15 @@ services: build: context: ./aspnet-core/services/Publish/internal-apigateway volumes: - - D:\Project\Abp\logs\internal-apigateway:/app/Logs - - D:\Project\Abp\data\internal-apigateway\Modules:/app/Modules + - D:\Projects\Development\Abp\Application\logs\internal-apigateway:/app/Logs + - D:\Projects\Development\Abp\Application\data\internal-apigateway\Modules:/app/Modules networks: - framework + +volumes: + dbdata: networks: framework: - name: nt + name: linyun-abp external: true diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 238b97d4c..6e5cd5588 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -110,5 +110,5 @@ services: networks: framework: - external: - name: ly_app_net + name: linyun-abp + external: true diff --git a/docker-compose.yml b/docker-compose.yml index 924e0976c..e561db2e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.4' services: admin-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30010:80" @@ -12,7 +12,7 @@ services: sts-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30015:80" @@ -21,7 +21,7 @@ services: localization-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30030:80" @@ -30,7 +30,7 @@ services: platform-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30025:80" @@ -39,7 +39,7 @@ services: messages-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30020:80" @@ -48,7 +48,7 @@ services: task-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30040:80" @@ -57,7 +57,7 @@ services: webhook-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30045:80" @@ -66,7 +66,7 @@ services: workflow-api: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30050:80" @@ -75,7 +75,7 @@ services: sts-server: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "44385:80" @@ -84,7 +84,7 @@ services: internal-apigateway: environment: - - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_URLS=http://0.0.0.0:80 ports: - "30000:80"