Merge pull request #82 from colinin/3.1

add identity-server4-admin Dockerfile

aspnet-core/services/identity-server/LINGYUN.Abp.IdentityServer4.HttpApi.Host/Dockerfile

@@ -0,0 +1,13 @@
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS runtime
+LABEL maintainer="colin.in@foxmail.com"
+WORKDIR /app
+
+COPY . /app
+
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
+
+EXPOSE 80/tcp
+VOLUME [ "./app/Logs" ]
+
+ENTRYPOINT ["dotnet", "LINGYUN.Abp.IdentityServer4.HttpApi.Host.dll"]

docker-compose.override.yml

@@ -8,6 +8,13 @@ services:
     ports:
       - "30010:80"
 
+  identity-server-admin:
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Production
+      - ASPNETCORE_URLS=http://0.0.0.0:80
+    ports:
+      - "30015:80"
+
   platform-service:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
@@ -22,7 +29,7 @@ services:
     ports:
       - "30020:80"
 
-  identity-server:
+  identity-server-sts:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80

docker-compose.yml

@@ -1,43 +1,57 @@
 version: '3.4'
 
 services:
+  identity-server-sts:
+    build:
+      context: ./aspnet-core/services/Publish/identityserver
+    volumes: 
+      - /var/opt/abp/logs/ids-sts:/app/Logs
+    restart: always
+
+  identity-server-admin:
+    build:
+      context: ./aspnet-core/services/Publish/identityserver4-admin
+    volumes: 
+      - /var/opt/abp/logs/ids-admin:/app/Logs
+    depends_on: 
+      - identity-server-sts
+    restart: always
+
   admin-service:
     build:
       context: ./aspnet-core/services/Publish/admin
     volumes: 
-      - /var/opt/abp/LogCenter/Admin:/app/Logs
+      - /var/opt/abp/logs/backend-admin:/app/Logs
+    depends_on: 
+      - identity-server-sts
     restart: always
 
   platform-service:
     build:
       context: ./aspnet-core/services/Publish/platform
     volumes: 
-      - /var/opt/abp/LogCenter/Platform:/app/Logs
-      - /var/opt/abp/Data/Platform:/app/file-blob-storing
+      - /var/opt/abp/logs/platform:/app/Logs
+      - /var/opt/abp/data/platform:/app/file-blob-storing
+    depends_on: 
+      - identity-server-sts
     restart: always
 
   messages-service:
     build:
       context: ./aspnet-core/services/Publish/messages
     volumes: 
-      - /var/opt/abp/LogCenter/Messages:/app/Logs
-    restart: always
-    
-  identity-server:
-    build:
-      context: ./aspnet-core/services/Publish/identityserver
-    volumes: 
-      - /var/opt/abp/LogCenter/IdentityServer:/app/Logs
+      - /var/opt/abp/logs/messages:/app/Logs
     depends_on: 
-      - admin-service
+      - identity-server-sts
     restart: always
   
   apigateway-admin-service:
     build:
       context: ./aspnet-core/services/Publish/apigateway-admin
     volumes: 
-      - /var/opt/abp/LogCenter/ApiGateway-Admin:/app/Logs
+      - /var/opt/abp/logs/apigateway-admin:/app/Logs
     depends_on: 
+      - identity-server-sts
       - admin-service
     restart: always
 
@@ -45,8 +59,9 @@ services:
     build:
       context: ./aspnet-core/services/Publish/apigateway-host
     volumes: 
-      - /var/opt/abp/LogCenter/ApiGateway-Host:/app/Logs
+      - /var/opt/abp/logs/apigateway-host:/app/Logs
     depends_on: 
+      - identity-server-sts
       - apigateway-admin-service
     restart: always
 
@@ -54,12 +69,12 @@ services:
     build:
       context: ./vueJs
     volumes: 
-      - /var/opt/abp/Data/client/nginx:/etc/nginx/nginx.conf
-      - /var/opt/abp/Data/client/nginx/conf.d:/etc/nginx/conf.d/default.conf
+      - /var/opt/abp/data/client/nginx:/etc/nginx/nginx.conf
+      - /var/opt/abp/data/client/nginx/conf.d:/etc/nginx/conf.d/default.conf
     restart: always
     
 volumes:
   dbdata:
 
 networks: 
-  linyun-abp:
+  linyun-abp: