Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bring back SP + disable all not needed services + update rabbitmq healthcheck #305

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bring back SP + disable all not needed services + update rabbitmq healthcheck #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 54 additions & 27 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ services:

gateway:
image: georchestra/gateway:latest
scale: 1 # set to 0 if using security-proxy
depends_on:
- database
volumes:
Expand All @@ -94,28 +95,28 @@ services:
- .envs-hosts
- .envs-database-georchestra

# uncomment for oauth 2.0
# cas:
# image: georchestra/cas:latest
# healthcheck:
# test: [ "CMD-SHELL", "curl -s -f http://localhost:8080/cas/login >/dev/null || exit 1" ]
# interval: 30s
# timeout: 10s
# retries: 10
# depends_on:
# ldap:
# condition: service_healthy
# volumes:
# - georchestra_datadir:/etc/georchestra
# environment:
# - JAVA_OPTIONS=-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
# - XMS=256M
# - XMX=1G
# env_file:
# - .envs-common
# - .envs-ldap
# - .envs-database-georchestra
# restart: always
cas:
image: georchestra/cas:latest
scale: 0 # set to 1 if need for oauth 2.0 and security-proxy
healthcheck:
test: [ "CMD-SHELL", "curl -s -f http://localhost:8080/cas/login >/dev/null || exit 1" ]
interval: 30s
timeout: 10s
retries: 10
depends_on:
ldap:
condition: service_healthy
volumes:
- georchestra_datadir:/etc/georchestra
environment:
- JAVA_OPTIONS=-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
- XMS=256M
- XMX=1G
env_file:
- .envs-common
- .envs-ldap
- .envs-database-georchestra
restart: always

header:
image: georchestra/header:latest
Expand Down Expand Up @@ -241,6 +242,7 @@ services:

analytics:
image: georchestra/analytics:latest
scale: 0 # set to 1 if security proxy is activated
healthcheck:
test: ["CMD-SHELL", "curl -s -f http://localhost:8080/analytics/ >/dev/null || exit 1"]
interval: 30s
Expand Down Expand Up @@ -398,17 +400,42 @@ services:

rabbitmq:
image: docker.io/bitnami/rabbitmq:3.12
scale: 0 # set to 1 if need rabbitmq
healthcheck:
test: rabbitmq-diagnostics -q ping && rabbitmq-diagnostics -q check_local_alarms
interval: 60s
test: rabbitmq-diagnostics -q ping
interval: 15s
timeout: 30s
retries: 3
retries: 6
env_file:
- .envs-rabbitmq
environment:
- RABBITMQ_LOGS=-
volumes:
- 'rabbitmq_data:/bitnami/rabbitmq/mnesia'
restart: always



proxy:
image: georchestra/security-proxy:latest
scale: 0 #set to 1 if need security-proxy but set 0 gateway service
healthcheck:
test: ["CMD-SHELL", "curl -s -f http://localhost:8080/_static/bootstrap_3.0.0/css/bootstrap-theme.min.css >/dev/null || exit 1"]
interval: 30s
timeout: 10s
retries: 10
depends_on:
ldap:
condition: service_healthy
database:
condition: service_healthy
volumes:
- georchestra_datadir:/etc/georchestra
environment:
- JAVA_OPTIONS=-Dorg.eclipse.jetty.annotations.AnnotationParser.LEVEL=OFF
- XMS=256M
- XMX=1G
env_file:
- .envs-common
- .envs-ldap
- .envs-hosts
- .envs-database-georchestra
restart: always
1 change: 1 addition & 0 deletions resources/caddy/etc/Caddyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
}

handle {
# modify from gateway to proxy if security-proxy is enabled
reverse_proxy gateway:8080
header {
Access-Control-Allow-Origin *
Expand Down