Merge branch 'master' of github.com:Alfresco/acs-community-packaging

This commit is contained in:
Michael
2018-06-17 17:12:56 +01:00
4 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
ALFRESCO_TAG=latest
SHARE_TAG=6.0.a
SHARE_TAG=6.0.b
SOLR6_TAG=1.1.1
POSTGRES_TAG=10.1
REGISTRY=
+2 -1
View File
@@ -28,6 +28,7 @@ services:
-Dftp.dataPortFrom=30000
-Dftp.dataPortTo=30099
-Dcifs.enabled=true
-Dshare.host=localhost
"
ports:
- 8082:8080
@@ -66,4 +67,4 @@ services:
#Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
ports:
- 8083:8983 #Browser port
- 8083:8983 #Browser port
+1 -1
View File
@@ -1,5 +1,5 @@
export ALFRESCO_TAG=latest
export SHARE_TAG=6.0.a
export SHARE_TAG=6.0.b
export SOLR6_TAG=1.1.1
export POSTGRES_TAG=10.1
export REGISTRY=
+1 -1
View File
@@ -81,7 +81,7 @@
<!-- Alfresco Share version -->
<alfresco.share.version>6.0.0-rc2</alfresco.share.version>
<alfresco.alfresco-share-services.version>6.0.a</alfresco.alfresco-share-services.version>
<alfresco.alfresco-share-services.version>6.0.b</alfresco.alfresco-share-services.version>
<!-- Alfresco GoogleDocs integration version -->
<alfresco.googledocs.version>3.1.0</alfresco.googledocs.version>