Skip to content

Add config to docker image #1792

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

Merged
bogdandrutu merged 2 commits into from
Sep 22, 2020
Merged

Add config to docker image #1792

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b05283
Add config to docker image
pavolloffay Sep 16, 2020
2c50a4d
Change dockerfile and copy config
pavolloffay Sep 18, 2020
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ coverage.html
# Wix
*.wixobj
*.wixpdb

cmd/otelcol/otel-local-config.yaml
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ delete-tag:

.PHONY: docker-otelcol
docker-otelcol:
cp examples/otel-local-config.yaml cmd/otelcol
Copy link
Member Author

@pavolloffay pavolloffay Sep 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not nice but seems better than setting the docker context to the root of the project.

COMPONENT=otelcol $(MAKE) docker-component

.PHONY: binaries
Expand Down
1 change: 1 addition & 0 deletions cmd/otelcol/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ RUN chmod 755 /otelcol
FROM scratch
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=otelcol /otelcol /
COPY otel-local-config.yaml /config.yaml
ENTRYPOINT ["/otelcol"]
EXPOSE 55678 55679