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

# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/classification/content/documents/ClassifyActionTest.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/enterprise/security/guides/GuidesAndPartialClearanceTests.java
#	scripts/dockerLimitMemory.sh
This commit is contained in:
Claudia Agache
2020-11-05 16:28:25 +02:00
parent 3fac7fe676
commit df70cda5e8
13 changed files with 375 additions and 84 deletions

View File

@@ -3,5 +3,9 @@
set -ev
cd $1
docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD}
# if 2nd input parameter is true then use .env.ci where TRANSFORM_SERVICE_ENABLED flag is set to false
# in order to not use anymore Transform router and Shared File Store
if $2 ; then
mv -u .env.ci .env
fi
docker-compose up -d