Skip to content

Commit

Permalink
[chore] specify default value for tracetest image version (open-telem…
Browse files Browse the repository at this point in the history
…etry#1551)

* specify default value for tracetest image version

* update tracetest to v1.0.0
  • Loading branch information
puckpuck authored and AlexPSplunk committed Jul 10, 2024
1 parent 651acaa commit 6ac3989
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ OPENSEARCH_IMAGE=opensearchproject/opensearch:2.12.0
POSTGRES_IMAGE=postgres:16.2
PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.1
REDIS_IMAGE=redis:7.2-alpine
TRACETEST_IMAGE_VERSION=v0.16.0
TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION}
TRACETEST_IMAGE=kubeshop/tracetest:v1.0.0

# Demo Platform
ENV_PLATFORM=local
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ the release.
([#1528](https://github.com/open-telemetry/opentelemetry-demo/pull/1528))
* [otelcollector] Add `redisreceiver`
([#1537](https://github.com/open-telemetry/opentelemetry-demo/pull/1537))
* [traceBasedTests] update to v1.0.0
([#1551](https://github.com/open-telemetry/opentelemetry-demo/pull/1551))

## 1.9.0

Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,6 @@ services:
build:
context: ./
dockerfile: ./test/tracetesting/Dockerfile
args:
- TRACETEST_IMAGE_VERSION
environment:
- AD_SERVICE_ADDR
- CART_SERVICE_ADDR
Expand Down
5 changes: 3 additions & 2 deletions test/tracetesting/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ FROM alpine

WORKDIR /app

ARG TRACETEST_IMAGE_VERSION
# The build-images workflow action does not set a build-arg so we need to specify a default value here
ARG TRACETEST_IMAGE_VERSION=v1.0.0

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}
RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- $TRACETEST_IMAGE_VERSION

WORKDIR /app/test/tracetesting

Expand Down

0 comments on commit 6ac3989

Please sign in to comment.