Browse Source

update docker-compose.yml

pull/439/head
cKey 4 years ago
parent
commit
7138d65f78
  1. 9
      apps/vue/docker-compose.yml
  2. 7
      apps/vue/src/components/SettingManagement/src/SettingForm.vue
  3. 49
      docker-compose.override.yml
  4. 14
      docker-compose.yml

9
apps/vue/docker-compose.yml

@ -7,9 +7,10 @@ services:
restart: always restart: always
ports: ports:
- "40080:80" - "40080:80"
networks:
volumes: - framework
dbdata:
networks: networks:
linyun-abp: framework:
external:
name: ly_app_net

7
apps/vue/src/components/SettingManagement/src/SettingForm.vue

@ -2,7 +2,7 @@
<Form :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }"> <Form :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }">
<Row type="flex"> <Row type="flex">
<Col :span="24"> <Col :span="24">
<Tabs v-model:activeKey="activeTabKey"> <Tabs v-model:activeKey="activeTabKey" :tab-position="tabPosition">
<TabPane <TabPane
v-for="(group, tabIndex) in settingGroups" v-for="(group, tabIndex) in settingGroups"
:key="tabIndex" :key="tabIndex"
@ -108,7 +108,10 @@
type: Function as PropType<(...args: any) => Promise<any>>, type: Function as PropType<(...args: any) => Promise<any>>,
required: true, required: true,
}, },
tabPosition: { type: String }, tabPosition: {
type: String,
defaultValue: 'top',
},
} as const; // props see: https://blog.csdn.net/q535999731/article/details/109578885 } as const; // props see: https://blog.csdn.net/q535999731/article/details/109578885
export default defineComponent({ export default defineComponent({

49
docker-compose.override.yml

@ -1,43 +1,53 @@
version: '3.4' version: '3.4'
services: services:
identity-server-sts: sts-server:
build: build:
context: ./aspnet-core/services/Publish/identityserver context: ./aspnet-core/services/Publish/identityserver
volumes: volumes:
- /var/opt/abp/logs/ids-sts:/app/Logs - /var/opt/abp/logs/ids-sts:/app/Logs
- /var/opt/abp/data/ids-sts/Modules:/app/Modules - /var/opt/abp/data/ids-sts/Modules:/app/Modules
restart: always restart: always
networks:
- framework
identity-server-admin: sts-api:
build: build:
context: ./aspnet-core/services/Publish/identityserver4-admin context: ./aspnet-core/services/Publish/identityserver4-admin
volumes: volumes:
- /var/opt/abp/logs/ids-admin:/app/Logs - /var/opt/abp/logs/ids-admin:/app/Logs
- /var/opt/abp/data/ids-admin/Modules:/app/Modules - /var/opt/abp/data/ids-admin/Modules:/app/Modules
depends_on: depends_on:
- identity-server-sts - sts-server
restart: always restart: always
networks:
- framework
admin-service: admin-api:
build: build:
context: ./aspnet-core/services/Publish/admin context: ./aspnet-core/services/Publish/admin
volumes: volumes:
- /var/opt/abp/logs/backend-admin:/app/Logs - /var/opt/abp/logs/backend-admin:/app/Logs
- /var/opt/abp/data/backend-admin/Modules:/app/Modules - /var/opt/abp/data/backend-admin/Modules:/app/Modules
depends_on: depends_on:
- identity-server-sts - sts-server
restart: always restart: always
networks:
- framework
localization-service: localization-api:
build: build:
context: ./aspnet-core/services/Publish/localization context: ./aspnet-core/services/Publish/localization
volumes: volumes:
- /var/opt/abp/logs/localization:/app/Logs - /var/opt/abp/logs/localization:/app/Logs
- /var/opt/abp/data/localization/Modules:/app/Modules - /var/opt/abp/data/localization/Modules:/app/Modules
restart: always restart: always
depends_on:
- sts-server
networks:
- framework
platform-service: platform-api:
build: build:
context: ./aspnet-core/services/Publish/platform context: ./aspnet-core/services/Publish/platform
volumes: volumes:
@ -45,29 +55,34 @@ services:
- /var/opt/abp/data/platform/Modules:/app/Modules - /var/opt/abp/data/platform/Modules:/app/Modules
- /var/opt/abp/data/platform:/app/file-blob-storing - /var/opt/abp/data/platform:/app/file-blob-storing
depends_on: depends_on:
- identity-server-sts - sts-server
restart: always restart: always
networks:
- framework
messages-service: messages-api:
build: build:
context: ./aspnet-core/services/Publish/messages context: ./aspnet-core/services/Publish/messages
volumes: volumes:
- /var/opt/abp/logs/messages:/app/Logs - /var/opt/abp/logs/messages:/app/Logs
- /var/opt/abp/data/messages/Modules:/app/Modules - /var/opt/abp/data/messages/Modules:/app/Modules
depends_on: depends_on:
- identity-server-sts - sts-server
restart: always restart: always
networks:
- framework
internat-apigateway: internal-apigateway:
build: build:
context: ./aspnet-core/services/Publish/internal-apigateway context: ./aspnet-core/services/Publish/internal-apigateway
volumes: volumes:
- /var/opt/abp/logs/internat-apigateway:/app/Logs - /var/opt/abp/logs/internal-apigateway:/app/Logs
- /var/opt/abp/data/internat-apigateway/Modules:/app/Modules - /var/opt/abp/data/internal-apigateway/Modules:/app/Modules
restart: always restart: always
networks:
volumes: - framework
dbdata:
networks: networks:
linyun-abp: framework:
external:
name: ly_app_net

14
docker-compose.yml

@ -1,49 +1,49 @@
version: '3.4' version: '3.4'
services: services:
admin-service: admin-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30010:80" - "30010:80"
identity-server-admin: sts-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30015:80" - "30015:80"
localization-service: localization-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30030:80" - "30030:80"
platform-service: platform-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30025:80" - "30025:80"
messages-service: messages-api:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "30020:80" - "30020:80"
identity-server-sts: sts-server:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80
ports: ports:
- "44385:80" - "44385:80"
internat-apigateway: internal-apigateway:
environment: environment:
- ASPNETCORE_ENVIRONMENT=Production - ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://0.0.0.0:80 - ASPNETCORE_URLS=http://0.0.0.0:80

Loading…
Cancel
Save