Skip to content

Commit 5330445

Browse files
authored
feat: Add support for docker-compose.override.yml (#14)
feat: Add support for `docker-compose.override.yml`, update OpenTelemetry collector configuration, and adjust PGAdmin port.
1 parent b3b821d commit 5330445

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

.env.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ REDISINSIGHT_PORT=8032
2727

2828
POSTGRES_PORT=5432
2929
POSTGRES_PASSWORD=opencodeco
30-
PGADMIN_PORT=8034
30+
PGADMIN_PORT=8039
3131
PGADMIN_EMAIL="opencodeco@domain.com"
3232
PGADMIN_PASSWORD="opencodeco"
3333

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.env
2+
*/docker-compose.override.yml

o11y/otelcol-config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ receivers:
1212
http:
1313

1414
exporters:
15-
logging:
15+
debug:
1616
verbosity: detailed
1717
prometheus:
1818
endpoint: 0.0.0.0:9090
@@ -28,7 +28,7 @@ service:
2828
pipelines:
2929
traces:
3030
receivers: [otlp, jaeger]
31-
exporters: [logging, otlp/jaeger]
31+
exporters: [debug, otlp/jaeger]
3232
metrics:
3333
receivers: [otlp, statsd]
34-
exporters: [logging, prometheus]
34+
exporters: [debug, prometheus]

stack

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,10 @@ if [ ! -f "${COMPONENT}/docker-compose.yml" ]; then
106106
fi
107107

108108
CMD="${@:2}"
109-
$CONTAINER_COMPOSE -f "${COMPONENT}/docker-compose.yml" ${CMD:-up -d}
109+
110+
COMPOSE_FILES="-f ${COMPONENT}/docker-compose.yml"
111+
if [ -f "${COMPONENT}/docker-compose.override.yml" ]; then
112+
COMPOSE_FILES="${COMPOSE_FILES} -f ${COMPONENT}/docker-compose.override.yml"
113+
fi
114+
115+
$CONTAINER_COMPOSE $COMPOSE_FILES ${CMD:-up -d}

0 commit comments

Comments
 (0)