fixed

Signed-off-by: mehul gautam <[email protected]>
jaegertracing · Jul 16, 2024 · 5c64603 · 5c64603
1 parent c214dcb
commit 5c64603
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/examples/hotrod/docker-compose.yml b/examples/hotrod/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3.7'
 
 services:
   jaeger:
-    image: jaegertracing/all-in-one:${JAEGER_VERSION:-latest}
+    image: ${REGISTRY:-}jaegertracing/all-in-one:${JAEGER_VERSION:-latest}
     ports:
       - "16686:16686"
       - "4317:4317"
@@ -15,7 +15,7 @@ services:
       - jaeger-example
 
   hotrod:
-    image: ${REGISTRY:-}jaegertracing/example-hotrod:${GITHUB_SHA:-${JAEGER_VERSION:-latest}}
+    image: ${REGISTRY:-}jaegertracing/example-hotrod:${JAEGER_VERSION:-latest}
     # To run the latest trunk build, find the tag at Docker Hub and use the line below
     # https://hub.docker.com/r/jaegertracing/example-hotrod-snapshot/tags
     #image: jaegertracing/example-hotrod-snapshot:0ab8f2fcb12ff0d10830c1ee3bb52b745522db6c

diff --git a/scripts/hotrod-integration-test.sh b/scripts/hotrod-integration-test.sh
@@ -3,7 +3,6 @@
 set -euxf -o pipefail
 
 docker_compose_file="./examples/hotrod/docker-compose.yml"
-export REGISTRY="localhost:5000/"
 platforms="linux/amd64,linux/s390x,linux/ppc64le,linux/arm64"
 
 teardown() {
@@ -18,11 +17,13 @@ make build-examples GOOS=linux GOARCH=ppc64le
 make build-examples GOOS=linux GOARCH=arm64
 
 make prepare-docker-buildx
+make create-baseimg
 
 # Build image locally (-l) for integration test
 bash scripts/build-upload-a-docker-image.sh -l -c example-hotrod -d examples/hotrod -p "${platforms}"
+bash scripts/build-upload-a-docker-image.sh -l -b -c all-in-one -d cmd/all-in-one -p "${platforms}" -t release
 
-docker compose -f "$docker_compose_file" up -d
+JAEGER_VERSION=$GITHUB_SHA REGISTRY="localhost:5000/" docker compose -f "$docker_compose_file" up -d
 
 i=0
 while [[ "$(curl -s -o /dev/null -w '%{http_code}' localhost:8080)" != "200" && $i -lt 30 ]]; do