Compare commits

..

24 Commits

Author SHA1 Message Date
c3880ac43d ADW v4.1.0 2023-10-25 20:28:03 -04:00
a1bd61bdde Merge branch 'acs-base' into acs-adw-base 2023-10-25 20:27:33 -04:00
57af0a20b1 ACS v7.4.1.1 2023-10-25 20:11:15 -04:00
76e4287aa1 Merge branch 'proxy' into acs-base 2023-10-25 20:08:28 -04:00
241a3e47ea Merge branch 'base' into proxy 2023-10-25 18:07:00 -04:00
c2a9679ede update comment 2023-10-25 18:05:39 -04:00
7113aa012f parameterized the ADW version 2022-11-01 15:36:33 -04:00
d4426fe373 Merge branch 'acs-base' into acs-adw-base 2022-11-01 15:32:54 -04:00
8e3301877a parameterized docker image tags 2022-11-01 14:51:11 -04:00
8b4e45c2e2 Merge branch 'proxy' into acs-base 2022-11-01 14:49:06 -04:00
9e1a819e8b Merge branch 'base' into proxy 2022-11-01 14:48:11 -04:00
10e7f81163 advancing to docker v3 2022-11-01 14:46:58 -04:00
29f254a68e updated to ACS v7.3.0 2022-11-01 14:19:58 -04:00
brian
ec00d1a445 Merge branch 'acs-base' into acs-adw-base 2021-04-02 09:13:18 -04:00
5ea48c405f added host-based config 2021-01-13 18:14:24 -05:00
0a0cb15580 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2021-01-06 15:54:12 -05:00
56492a45c8 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-25 23:30:25 -05:00
f239550be7 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-17 16:29:54 -05:00
e5824d17e1 added adw to nginx 2020-12-17 16:28:54 -05:00
5cd3530ef0 Merge branch 'acs-base.proxy' into acs-adw-base.acs-base 2020-12-17 16:26:50 -05:00
b9fb8971dd Merge branch 'acs-base.base' into acs-adw-base.acs-base 2020-12-17 12:48:57 -05:00
8296a96294 Merge branch 'acs-base.base' into acs-adw-base.acs-base 2020-12-17 12:38:18 -05:00
4f036e530b Merge branch 'acs-base.base' into acs-adw-base.acs-base 2020-12-16 23:56:24 -05:00
89626fcd1d added minimum unconfigured ADW service 2020-12-16 23:42:22 -05:00
4 changed files with 38 additions and 7 deletions

5
.env
View File

@@ -4,3 +4,8 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost
PROXY_PORT=8080 PROXY_PORT=8080
ACS_TAG=7.4.1.1
AAMQ_TAG=latest
POSTGRES_TAG=13
ADW_TAG=4.1.0

View File

@@ -1,12 +1,21 @@
# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
# #
# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose version: "3"
version: "2"
services: services:
platform: platform:
image: alfresco/alfresco-content-repository:latest image: alfresco/alfresco-content-repository-community:${ACS_TAG}
environment: environment:
JAVA_TOOL_OPTIONS: "
-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede"
JAVA_OPTS: " JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver -Ddb.driver=org.postgresql.Driver
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
@@ -20,15 +29,21 @@ services:
- activemq - activemq
postgres-acs: postgres-acs:
image: postgres:latest image: postgres:${POSTGRES_TAG}
activemq: activemq:
image: alfresco/alfresco-activemq:latest 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

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 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

View File

@@ -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;
}
} }
} }