Skip to content

Commit cb921fd

Browse files
authored
Merge pull request #96 from eramba/triggers-container
Triggers container
2 parents 2faa77c + 6fde1e7 commit cb921fd

2 files changed

Lines changed: 47 additions & 2 deletions

File tree

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ PROXY_AUTH_PASS=
1313
PUBLIC_ADDRESS=https://localhost:8443
1414
DOCKER_DEPLOYMENT=1
1515
LDAPTLS_REQCERT=never
16+
TRIGGER_RUNNER_SHARED_SECRET=c86b1a9edd5fdad7f85c95775f42246d761c5486b9059b7db23efc69410b9eaf

docker-compose.simple-install.yml

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ services:
1313
MYSQL_USER: ${DB_USERNAME}
1414
MYSQL_PASSWORD: ${DB_PASSWORD}
1515
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
16+
networks:
17+
- app_internal
18+
- host_access
1619
redis:
1720
container_name: redis
1821
image: redis:7.4.2-alpine
1922
restart: always
23+
networks:
24+
- app_internal
2025
eramba:
2126
container_name: eramba
2227
image: ghcr.io/eramba/eramba:latest
@@ -33,26 +38,31 @@ services:
3338
- ./apache/ports.conf:/etc/apache2/ports.conf
3439
- ./apache/vhost-ssl.conf:/etc/apache2/sites-available/000-default.conf
3540
- ./crontab/crontab:/etc/cron.d/eramba-crontab
41+
- trigger-logs:/var/log/trigger-limits
3642
environment:
3743
DB_HOST: ${DB_HOST}
3844
DB_DATABASE: ${DB_DATABASE}
3945
DB_USERNAME: ${DB_USERNAME}
4046
DB_PASSWORD: ${DB_PASSWORD}
4147
CACHE_URL: ${CACHE_URL}
48+
PUBLIC_ADDRESS: ${PUBLIC_ADDRESS}
4249
USE_PROXY: ${USE_PROXY}
4350
PROXY_HOST: ${PROXY_HOST}
4451
PROXY_PORT: ${PROXY_PORT}
4552
USE_PROXY_AUTH: ${USE_PROXY_AUTH}
4653
PROXY_AUTH_USER: ${PROXY_AUTH_USER}
4754
PROXY_AUTH_PASS: ${PROXY_AUTH_PASS}
48-
PUBLIC_ADDRESS: ${PUBLIC_ADDRESS}
55+
TRIGGER_RUNNER_SHARED_SECRET: ${TRIGGER_RUNNER_SHARED_SECRET}
4956
DOCKER_DEPLOYMENT: ${DOCKER_DEPLOYMENT}
5057
LDAPTLS_REQCERT: ${LDAPTLS_REQCERT}
5158
links:
5259
- mysql
5360
- redis
5461
depends_on:
5562
- mysql
63+
networks:
64+
- app_internal
65+
- triggers_net
5666
cron:
5767
container_name: cron
5868
image: ghcr.io/eramba/eramba:latest
@@ -72,13 +82,14 @@ services:
7282
DB_USERNAME: ${DB_USERNAME}
7383
DB_PASSWORD: ${DB_PASSWORD}
7484
CACHE_URL: ${CACHE_URL}
85+
PUBLIC_ADDRESS: ${PUBLIC_ADDRESS}
7586
USE_PROXY: ${USE_PROXY}
7687
PROXY_HOST: ${PROXY_HOST}
7788
PROXY_PORT: ${PROXY_PORT}
7889
USE_PROXY_AUTH: ${USE_PROXY_AUTH}
7990
PROXY_AUTH_USER: ${PROXY_AUTH_USER}
8091
PROXY_AUTH_PASS: ${PROXY_AUTH_PASS}
81-
PUBLIC_ADDRESS: ${PUBLIC_ADDRESS}
92+
TRIGGER_RUNNER_SHARED_SECRET: ${TRIGGER_RUNNER_SHARED_SECRET}
8293
DOCKER_DEPLOYMENT: ${DOCKER_DEPLOYMENT}
8394
LDAPTLS_REQCERT: ${LDAPTLS_REQCERT}
8495
links:
@@ -87,8 +98,41 @@ services:
8798
- eramba
8899
depends_on:
89100
- eramba
101+
networks:
102+
- app_internal
103+
- triggers_net
104+
triggers_caddy:
105+
image: ghcr.io/eramba/eramba-triggers:latest
106+
container_name: triggers_caddy
107+
entrypoint:
108+
- /app/iptables-entrypoint.sh
109+
volumes:
110+
- trigger-logs:/var/log/trigger-limits
111+
- trigger-storage:/data/eramba_trigger_storage
112+
depends_on:
113+
- eramba
114+
environment:
115+
CRON_HOST: cron
116+
TRIGGER_RUNNER_SHARED_SECRET: ${TRIGGER_RUNNER_SHARED_SECRET}
117+
cap_add:
118+
- NET_ADMIN
119+
networks:
120+
- triggers_net
121+
healthcheck:
122+
test: ["CMD-SHELL", "curl -sS -o /dev/null -w '%{http_code}' http://127.0.0.1:9001/health | grep -q '^200$'"]
123+
interval: 30s
124+
timeout: 5s
125+
retries: 3
126+
start_period: 10s
90127
volumes:
91128
app:
92129
data:
93130
logs:
94131
db-data:
132+
trigger-logs:
133+
trigger-storage:
134+
networks:
135+
app_internal:
136+
internal: true
137+
triggers_net:
138+
host_access:

0 commit comments

Comments
 (0)