Compare commits
15 Commits
acs-mysql
...
acs-adw-ba
Author | SHA1 | Date | |
---|---|---|---|
c3880ac43d | |||
a1bd61bdde | |||
7113aa012f | |||
d4426fe373 | |||
|
ec00d1a445 | ||
5ea48c405f | |||
0a0cb15580 | |||
56492a45c8 | |||
f239550be7 | |||
e5824d17e1 | |||
5cd3530ef0 | |||
b9fb8971dd | |||
8296a96294 | |||
4f036e530b | |||
89626fcd1d |
1
.env
1
.env
@@ -8,3 +8,4 @@ PROXY_PORT=8080
|
|||||||
ACS_TAG=7.4.1.1
|
ACS_TAG=7.4.1.1
|
||||||
AAMQ_TAG=latest
|
AAMQ_TAG=latest
|
||||||
POSTGRES_TAG=13
|
POSTGRES_TAG=13
|
||||||
|
ADW_TAG=4.1.0
|
||||||
|
@@ -34,10 +34,16 @@ services:
|
|||||||
activemq:
|
activemq:
|
||||||
image: alfresco/alfresco-activemq:${AAMQ_TAG}
|
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:
|
proxy:
|
||||||
build: ./nginx-ingress
|
build: ./nginx-ingress
|
||||||
image: local/nginx-ingress:acs
|
image: local/nginx-ingress:acs-adw
|
||||||
ports:
|
ports:
|
||||||
- 8080:8080
|
- 8080:8080
|
||||||
depends_on:
|
depends_on:
|
||||||
- platform
|
- platform
|
||||||
|
- digital-workspace
|
||||||
|
@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
|
|||||||
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
|
sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ $ADW_URL ]]; then
|
||||||
|
sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ $ACCESS_LOG ]]; then
|
if [[ $ACCESS_LOG ]]; then
|
||||||
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
|
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
|
||||||
fi
|
fi
|
||||||
|
@@ -48,5 +48,12 @@ http {
|
|||||||
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
# If using external proxy / load balancer (for initial redirect if no trailing slash)
|
||||||
absolute_redirect off;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user