inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

update docker settings (#355)

Browse Source
This commit is contained in:
Denys Vuika 2018-05-11 18:40:46 +01:00 committed by GitHub
parent 6ec7096dd4
commit daf7d65c03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.env
View File

@ -1,5 +0,0 @@
ALFRESCO_TAG=6.0.5-ea
SHARE_TAG=6.0.a
SOLR6_TAG=1.1.1
POSTGRES_TAG=10.1
ACA_TAG=latest

2
Dockerfile
View File

@ -1,5 +1,5 @@
FROM nginx:alpine FROM nginx:alpine
LABEL version="1.2" LABEL version="1.3"
LABEL maintainer="Denys Vuika <denys.vuika@alfresco.com>" LABEL maintainer="Denys Vuika <denys.vuika@alfresco.com>"
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf

29
docker-compose.yml
View File

@ -2,13 +2,10 @@ version: "3"
services: services:
alfresco: alfresco:
image: alfresco/alfresco-content-repository-community:${ALFRESCO_TAG} image: alfresco/alfresco-content-repository-community:6.0.5-ea
depends_on: depends_on:
- postgres - postgres
environment: environment:
CATALINA_OPTS : "
-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n
"
JAVA_OPTS : " JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver -Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco -Ddb.username=alfresco
@ -19,15 +16,15 @@ services:
-Dsolr.secureComms=none -Dsolr.secureComms=none
-Dsolr.base.url=/solr -Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6 -Dindex.subsystem.name=solr6
-Ddeployment.method=DOCKER_COMPOSE
" "
networks: networks:
- internal - internal
ports: ports:
- 8080:8080 #Browser port - 8080:8080 #Browser port
- 8000:8000 #Debug port
share: share:
image: alfresco/alfresco-share:${SHARE_TAG} image: alfresco/alfresco-share:6.0.a
depends_on: depends_on:
- alfresco - alfresco
environment: environment:
@ -39,7 +36,7 @@ services:
- 8081:8080 - 8081:8080
postgres: postgres:
image: postgres:${POSTGRES_TAG} image: postgres:10.1
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@ -50,7 +47,7 @@ services:
- 5432:5432 - 5432:5432
solr6: solr6:
image: alfresco/alfresco-search-services:${SOLR6_TAG} image: alfresco/alfresco-search-services:1.1.1
depends_on: depends_on:
- alfresco - alfresco
environment: environment:
@ -68,7 +65,7 @@ services:
- 8983:8983 #Browser port - 8983:8983 #Browser port
content-app: content-app:
image: alfresco/alfresco-content-app:${ACA_TAG} image: alfresco/alfresco-content-app:latest
build: . build: .
depends_on: depends_on:
- alfresco - alfresco
@ -81,17 +78,15 @@ services:
# - ./nginx.conf:/etc/nginx/conf.d/default.conf # - ./nginx.conf:/etc/nginx/conf.d/default.conf
proxy: proxy:
#image: nginx image: nginx
image: alfresco/alfresco-content-app-proxy
build: ./docker-compose/proxy
depends_on: depends_on:
- content-app - content-app
# volumes: volumes:
# - ./docker-compose/nginx.conf:/etc/nginx/conf.d/default.conf - ./docker-compose/nginx.conf:/etc/nginx/conf.d/default.conf
networks: networks:
- internal - internal
ports: ports:
- 3000:80 - 3000:80
networks: networks:
internal: internal:

5
docker-compose/.env
View File

@ -1,5 +0,0 @@
ALFRESCO_TAG=6.0.5-ea
SHARE_TAG=6.0.a
SOLR6_TAG=1.1.1
POSTGRES_TAG=10.1
ACA_TAG=master

15
docker-compose/docker-compose.yml
View File

@ -2,13 +2,10 @@ version: "3"
services: services:
alfresco: alfresco:
image: alfresco/alfresco-content-repository-community:${ALFRESCO_TAG} image: alfresco/alfresco-content-repository-community:6.0.5-ea
depends_on: depends_on:
- postgres - postgres
environment: environment:
CATALINA_OPTS : "
-agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n
"
JAVA_OPTS : " JAVA_OPTS : "
-Ddb.driver=org.postgresql.Driver -Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco -Ddb.username=alfresco
@ -19,15 +16,15 @@ services:
-Dsolr.secureComms=none -Dsolr.secureComms=none
-Dsolr.base.url=/solr -Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6 -Dindex.subsystem.name=solr6
-Ddeployment.method=DOCKER_COMPOSE
" "
networks: networks:
- internal - internal
ports: ports:
- 8080:8080 #Browser port - 8080:8080 #Browser port
- 8000:8000 #Debug port
share: share:
image: alfresco/alfresco-share:${SHARE_TAG} image: alfresco/alfresco-share:6.0.a
depends_on: depends_on:
- alfresco - alfresco
environment: environment:
@ -39,7 +36,7 @@ services:
- 8081:8080 - 8081:8080
postgres: postgres:
image: postgres:${POSTGRES_TAG} image: postgres:10.1
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@ -50,7 +47,7 @@ services:
- 5432:5432 - 5432:5432
solr6: solr6:
image: alfresco/alfresco-search-services:${SOLR6_TAG} image: alfresco/alfresco-search-services:1.1.1
depends_on: depends_on:
- alfresco - alfresco
environment: environment:
@ -68,7 +65,7 @@ services:
- 8983:8983 #Browser port - 8983:8983 #Browser port
content-app: content-app:
image: alfresco/alfresco-content-app:${ACA_TAG} image: alfresco/alfresco-content-app:master
depends_on: depends_on:
- alfresco - alfresco
networks: networks:

4
docker-compose/proxy/Dockerfile
View File

@ -1,4 +0,0 @@
FROM nginx:alpine
LABEL version="1.2"
LABEL maintainer="Denys Vuika <denys.vuika@alfresco.com>"
COPY nginx.conf /etc/nginx/nginx.conf

49
docker-compose/proxy/nginx.conf
View File

@ -1,49 +0,0 @@
events {
worker_connections 1024;
}
http {
server {
listen *:80;
set $allowOriginSite *;
proxy_pass_request_headers on;
proxy_pass_header Set-Cookie;
location / {
proxy_pass http://content-app;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
proxy_buffering off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass_header Set-Cookie;
}
location /alfresco/ {
proxy_pass http://alfresco:8080;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
proxy_buffering off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass_header Set-Cookie;
}
location /share/ {
proxy_pass http://share:8080;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
proxy_buffering off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_pass_header Set-Cookie;
}
}
}