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.

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

fix: pass proper env var to tracetesting Dockerfile #1283

Merged
merged 4 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ release.

## Unreleased

* fix env var for pinning trace-based test tool version
([#1283](https://github.com/open-telemetry/opentelemetry-demo/pull/1283))
puckpuck marked this conversation as resolved.
Show resolved Hide resolved
* [currencyservice] bring back multistage build
([#1276](https://github.com/open-telemetry/opentelemetry-demo/pull/1276))
* [currencyservice]: update opentelemetry-cpp to 1.12.0
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,8 @@ services:
build:
context: ./
dockerfile: ./test/tracetesting/Dockerfile
args:
- TRACETEST_IMAGE_VERSION
environment:
- AD_SERVICE_ADDR
- CART_SERVICE_ADDR
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,8 @@ services:
build:
context: ./
dockerfile: ./test/tracetesting/Dockerfile
args:
- TRACETEST_IMAGE_VERSION
environment:
- AD_SERVICE_ADDR
- CART_SERVICE_ADDR
Expand Down
2 changes: 2 additions & 0 deletions test/tracetesting/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ FROM alpine

WORKDIR /app

ARG TRACETEST_IMAGE_VERSION

RUN apk --update add bash jq curl
RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- ${TRACETEST_IMAGE_VERSION}

Expand Down
Loading