Compare commits

...

5 Commits

Author SHA1 Message Date
b8016f4ac7 updated ACS memory limits 2021-07-30 15:52:07 -04:00
brian
d616b9ef3a Merge branch 'acs-base' into acs 2021-04-02 09:13:32 -04:00
6bce626075 Merge branch 'proxy' into acs-base 2021-04-02 08:42:43 -04:00
3d6aa1d4bc Merge branch 'base' into proxy 2021-04-02 08:41:45 -04:00
91ad3afc0a removed external dir 2021-04-02 08:40:18 -04:00
2 changed files with 5 additions and 5 deletions

5
.env
View File

@@ -1,6 +1,5 @@
EXTERNAL_RESOURCE_DIR=~ ALFRESCO_DIR=~/alfresco
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco ALFRESCO_LICENSE_DIR=~/alfresco/license
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
PROXY_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost

View File

@@ -36,7 +36,7 @@ services:
postgres-acs: postgres-acs:
image: postgres:11.7 image: postgres:11.7
mem_limit: 512m mem_limit: 128m
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@@ -45,11 +45,12 @@ services:
activemq: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m mem_limit: 512m
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs image: local/nginx-ingress:acs
mem_limit: 256m
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on: