Merge branch 'acs' into acs-enterprise

docker-compose.yml

@@ -5,7 +5,7 @@ version: "3"
 services:
 
     platform:
-        image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
+        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
         environment:
             JAVA_TOOL_OPTIONS: "
                 -Dencryption.keystore.type=JCEKS
@@ -31,7 +31,8 @@ services:
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                 -Ddeployment.method=DOCKER_COMPOSE
                 -Dcsrf.filter.enabled=false
-                -Dcors.enabled=false
+                -Dcors.enabled=true
+                -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
                 -Dtransform.service.enabled=false
                 -Dlocal.transform.service.enabled=false
                 -Dsystem.content.eagerOrphanCleanup=true