Merge branch 'ags-aims-enterprise' into dbp-aims

This commit is contained in:
Brian Long 2021-06-22 09:27:54 -04:00
commit 2ffde7c784
2 changed files with 10 additions and 8 deletions

4
.env
View File

@ -4,4 +4,6 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_HOST=localhost PROXY_HOST=localhost
PROXY_PORT=8080 PROXY_PORT=8080
IDENTITY_SERVICE_BASEURL=http://auth.example.org:8080 IDENTITY_SERVICE_PROTOCOL=http
IDENTITY_SERVICE_HOST=auth.example.org
IDENTITY_SERVICE_PORT=8080

View File

@ -1,7 +1,7 @@
# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # 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 # Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
version: "2" version: "2.1"
services: services:
platform: platform:
@ -50,7 +50,7 @@ services:
-Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm -Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
-Didentity-service.authentication.defaultAdministratorUserNames=admin.1 -Didentity-service.authentication.defaultAdministratorUserNames=admin.1
-Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
-Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0 -Dsystem.content.orphanProtectDays=0
@ -109,7 +109,7 @@ services:
-Daims.enabled=true -Daims.enabled=true
-Daims.realm=alfresco -Daims.realm=alfresco
-Daims.resource=acs-share -Daims.resource=acs-share
-Daims.authServerUrl=${IDENTITY_SERVICE_BASEURL}/auth -Daims.authServerUrl=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
-Daims.sslRequired=none -Daims.sslRequired=none
-Daims.publicClient=true -Daims.publicClient=true
-Daims.autodetectBearerOnly=true -Daims.autodetectBearerOnly=true
@ -156,7 +156,7 @@ services:
-Drepo.port=8080 -Drepo.port=8080
-Ddw.server.applicationConnectors[0].type=http -Ddw.server.applicationConnectors[0].type=http
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
-Didentity-service.resource=acs-sync -Didentity-service.resource=acs-sync
" "
depends_on: depends_on:
@ -175,7 +175,7 @@ services:
APP_CONFIG_PLUGIN_PROCESS_SERVICE: "true" APP_CONFIG_PLUGIN_PROCESS_SERVICE: "true"
#APP_CONFIG_PLUGIN_PROCESS_AUTOMATION: "true" #APP_CONFIG_PLUGIN_PROCESS_AUTOMATION: "true"
APP_CONFIG_AUTH_TYPE: OAUTH APP_CONFIG_AUTH_TYPE: OAUTH
APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_BASEURL}/auth/realms/alfresco" APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth/realms/alfresco"
APP_CONFIG_OAUTH2_CLIENTID: alfresco APP_CONFIG_OAUTH2_CLIENTID: alfresco
APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true" APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true"
APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/" APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"
@ -255,13 +255,13 @@ services:
environment: environment:
KEYCLOAK_USER: admin KEYCLOAK_USER: admin
KEYCLOAK_PASSWORD: admin KEYCLOAK_PASSWORD: admin
KEYCLOAK_HOSTNAME: auth.example.org KEYCLOAK_HOSTNAME: ${IDENTITY_SERVICE_HOST}
KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
KEYCLOAK_STATISTICS: enabled KEYCLOAK_STATISTICS: enabled
networks: networks:
default: default:
aliases: aliases:
- "auth.example.org" - "${IDENTITY_SERVICE_HOST}"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/auth"] test: ["CMD", "curl", "-f", "http://localhost:8080/auth"]
interval: 10s interval: 10s