Skip to content

feat: Add support for docker-compose.override.yml #14

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

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

feat: Add support for docker-compose.override.yml #14

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
2 changes: 1 addition & 1 deletion .env.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ REDISINSIGHT_PORT=8032

POSTGRES_PORT=5432
POSTGRES_PASSWORD=opencodeco
PGADMIN_PORT=8034
PGADMIN_PORT=8039
PGADMIN_EMAIL="opencodeco@domain.com"
PGADMIN_PASSWORD="opencodeco"

Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.env
*/docker-compose.override.yml
6 changes: 3 additions & 3 deletions o11y/otelcol-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ receivers:
http:

exporters:
logging:
debug:
verbosity: detailed
prometheus:
endpoint: 0.0.0.0:9090
Expand All @@ -28,7 +28,7 @@ service:
pipelines:
traces:
receivers: [otlp, jaeger]
exporters: [logging, otlp/jaeger]
exporters: [debug, otlp/jaeger]
metrics:
receivers: [otlp, statsd]
exporters: [logging, prometheus]
exporters: [debug, prometheus]
8 changes: 7 additions & 1 deletion stack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,10 @@ if [ ! -f "${COMPONENT}/docker-compose.yml" ]; then
fi

CMD="${@:2}"
$CONTAINER_COMPOSE -f "${COMPONENT}/docker-compose.yml" ${CMD:-up -d}

COMPOSE_FILES="-f ${COMPONENT}/docker-compose.yml"
if [ -f "${COMPONENT}/docker-compose.override.yml" ]; then
COMPOSE_FILES="${COMPOSE_FILES} -f ${COMPONENT}/docker-compose.override.yml"
fi

$CONTAINER_COMPOSE $COMPOSE_FILES ${CMD:-up -d}