inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-10 14:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Including proxy to 6.1 CE to server both alfresco and share web apps in port 8080

Browse Source
This commit is contained in:
Angel Borroy
2019-08-08 16:14:05 +02:00
parent 0a12f51487
commit c294e9b3e7
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
e2e-test/generator-alfresco-docker-compose/README.md
View File

@@ -174,20 +174,17 @@ If *Sharding* is selected, a default `share-config-custom-dev.xml` file with req
## Configuration catalog
| Version | Comms | Replication | Sharding | Explicit | Insight | Zeppelin |
| - | - | - | - | - | - | - |
| community | http | - | - | - | x | x |
| community | http | true | x | x | x | x |
| community | http | false | true | false | x | x |
| community | http | false | true | true | x | x |
| community | https | x | - | - | x | x |
| enterprise | http | - | - | - | (*) | (*) |
| enterprise | http | true | x | x | (*) | (*) |
| enterprise | http | false | true | false | (*) | (*) |
| enterprise | http | false | true | true | (*) | (*) |
| enterprise | https | x | - | - | (*) | (*) |
| enterprise | https | x | true | false | (*) | (*) |
| enterprise | https | x | true | true | (*) | (*) |
| Version | Comms | Replication | Sharding | Insight | Zeppelin |
| - | - | - | - | - | - |
| community | http | - | x | x | x |
| community | http | true | x | x | x |
| community | https | x | x | x | x |
| enterprise | http | - | - | (*) | (*) |
| enterprise | http | true | false | (*) | (*) |
| enterprise | http | false | true | (*) | (*) |
| enterprise | https | x | - | (*) | (*) |
| enterprise | https | x | true | (*) | (*) |
| enterprise | https | x | true | (*) | (*) |
Both `community` and `enterprise` ACS deployments can be used with the same options, but `enterprise` may also use Insight Engine (replacing Search Services) and Insight Zeppelin services.
@@ -231,7 +228,7 @@ $ docker-compose down
http://localhost:8080/share
http://localhost:8082/alfresco
http://localhost:8080/alfresco
http://localhost:8083/solr
@@ -244,7 +241,7 @@ http://localhost:8084/solr
http://localhost:8080/share
http://localhost:8082/alfresco
http://localhost:8080/alfresco
https://localhost:8443/alfresco

1
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
View File

@@ -16,5 +16,6 @@ SHARED_FILE_STORE_TAG=0.5.3
ACTIVE_MQ_TAG=5.15.8
DIGITAL_WORKSPACE_TAG=1.1.0
ACS_NGINX_TAG=3.0.0
ACS_COMMUNITY_NGINX_TAG=1.0.0
SEARCH_TAG=latest
ZEPPELIN_TAG=latest

17
e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
View File

@@ -32,10 +32,8 @@ services:
-Ddeployment.method=DOCKER_COMPOSE
-Dcsrf.filter.enabled=false
-Dalfresco.restApi.basicAuthScheme=true
-Xms1500m -Xmx1500m
"
" <% if (httpMode == 'https') { %>
ports:
- 8082:8080 <% if (httpMode == 'https') { %>
- 8443:8443
volumes:
- ./keystores/alfresco:/usr/local/tomcat/alf_data/keystore <% } %>
@@ -140,8 +138,6 @@ services:
-Dalfresco.context=alfresco
-Dalfresco.protocol=http
"
ports:
- 8080:8080
postgres:
image: postgres:${POSTGRES_TAG}
@@ -162,3 +158,14 @@ services:
- 5672:5672 # AMQP
- 61616:61616 # OpenWire
- 61613:61613 # STOMP
proxy:
image: alfresco/acs-community-ngnix:${ACS_COMMUNITY_NGINX_TAG}
mem_limit: 128m
depends_on:
- alfresco
ports:
- 8080:8080
links:
- alfresco
- share