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.

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

ACS-8856 Add Audit Storage to the docker compose setup #1212

Merged
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
23 changes: 22 additions & 1 deletion docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ services:
ports:
- "5432:5432"
elasticsearch:
image: elasticsearch:7.10.1
image: elasticsearch:7.17.3
gionn marked this conversation as resolved.
Show resolved Hide resolved
alxgomz marked this conversation as resolved.
Show resolved Hide resolved
environment:
- xpack.security.enabled=false
- discovery.type=single-node
Expand All @@ -162,6 +162,15 @@ services:
ports:
- 9200:9200
- 9300:9300
kibana:
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
image: kibana:7.17.3
mem_limit: 1g
gionn marked this conversation as resolved.
Show resolved Hide resolved
environment:
- ELASTICSEARCH_HOSTS=http://elasticsearch:9200
ports:
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
- "5601:5601"
depends_on:
- elasticsearch
search:
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.1.0
mem_limit: 1g
Expand Down Expand Up @@ -204,6 +213,18 @@ services:
- "5672:5672" # AMQP
- "61616:61616" # OpenWire
- "61613:61613" # STOMP
audit-storage:
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
image: quay.io/alfresco/alfresco-audit-storage:0.0.1-A7
mem_limit: 512m
environment:
SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000
AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_URI: http://elasticsearch:9200
AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_USERNAME: admin
AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_PASSWORD: admin
AUDIT_EVENTINGESTION_URI: activemq:topic:alfresco.repo.event2
depends_on:
- activemq
- elasticsearch
alxgomz marked this conversation as resolved.
Show resolved Hide resolved
digital-workspace:
image: quay.io/alfresco/alfresco-digital-workspace:5.1.0
mem_limit: 128m
Expand Down
3 changes: 0 additions & 3 deletions docker-compose/solr6-override-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,3 @@ services:
search-reindexing:
image: busybox:musl
command: "true"
elasticsearch:
image: busybox:musl
pmacius marked this conversation as resolved.
Show resolved Hide resolved
command: "true"