Merge branch 'aims' into acs-aims
This commit is contained in:
commit
1a0d8ba2b2
4
.env
4
.env
@ -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
|
||||||
|
@ -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:
|
||||||
@ -112,13 +112,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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user