Compare commits

..

15 Commits

4 changed files with 19 additions and 35 deletions

4
.env
View File

@@ -6,8 +6,6 @@ PROXY_HOST=localhost
PROXY_PORT=8080
ACS_TAG=7.4.1.1
ATR_TAG=3.0.0
ATE_AIO_TAG=4.0.0
ASFS_TAG=3.0.0
AAMQ_TAG=latest
POSTGRES_TAG=13
ADW_TAG=4.1.0

View File

@@ -27,31 +27,6 @@ services:
depends_on:
- postgres-acs
- activemq
- shared-file-store
transform-router:
image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
environment:
ACTIVEMQ_URL: "nio://activemq:61616"
CORE_AIO_URL : "http://transform-core-aio:8090"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
depends_on:
- activemq
- shared-file-store
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
environment:
ACTIVEMQ_URL: "nio://activemq:61616"
FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
depends_on:
- activemq
- shared-file-store
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
postgres-acs:
image: postgres:${POSTGRES_TAG}
@@ -59,16 +34,16 @@ services:
activemq:
image: alfresco/alfresco-activemq:${AAMQ_TAG}
digital-workspace:
image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
environment:
APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
proxy:
build: ./nginx-ingress
image: local/nginx-ingress:acs
image: local/nginx-ingress:acs-adw
ports:
- 8080:8080
depends_on:
- platform
volumes:
shared-file-store-volume:
driver_opts:
type: tmpfs
device: tmpfs
- digital-workspace

View File

@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ADW_URL ]]; then
sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACCESS_LOG ]]; then
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
fi

View File

@@ -48,5 +48,12 @@ http {
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
location /workspace/ {
proxy_pass http://digital-workspace:8080/;
# If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off;
}
}
}