inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/V3.0' into merge-3.1/APPS-238_APPS-104_no

Browse Source 
# Conflicts:
#	.travis.yml
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/community/smoke/records/RejectRecordTests.java
#	rm-automation/rm-automation-ui/src/test/resources/fp_l3.xml
#	scripts/dockerLimitMemory.sh
This commit is contained in:
Claudia Agache
2020-11-01 16:36:16 +02:00
parent 6128141e9a e7d6022032
commit 7c2ab7c7e1
12 changed files with 367 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/dockerLimitMemory.sh
View File

@@ -17,6 +17,11 @@ docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -
docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_libreoffice_' | awk '{print $1}')
docker update --memory=512Mb --memory-swap -1 --restart on-failure $(docker ps -a | grep '_activemq_' | awk '{print $1}')
shareContainerId=$(docker ps -a | grep '_share_' | awk '{print $1}')
if [ -n "$shareContainerId" ]; then
docker update --memory=1Gb --memory-swap -1 --restart on-failure $shareContainerId
fi
#stop not needed container
docker stop $(docker ps -a | grep '_zeppelin_' | awk '{print $1}')