Skip to content

Commit 9ecc84f

Browse files
authored
exp: Publish jaeger v2 image (jaegertracing#4919)
## Which problem is this PR solving? - Part of jaegertracing#4843 ## Description of the changes - Remove early exit and allow `jaeger` binary to be published to Docker Hub / quay.io - The repositories in the respective hubs were created manually ## How was this change tested? - Publishing only works on the main branch, will see how it goes once erged Signed-off-by: Yuri Shkuro <[email protected]>
1 parent 080b77f commit 9ecc84f

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

scripts/build-all-in-one-image.sh

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,22 @@ else
5858
make "build-${BINARY}" GOOS=linux GOARCH=arm64
5959
fi
6060

61-
# build all-in-one image locally for integration test
61+
# build all-in-one image locally for integration test (the -l switch)
6262
bash scripts/build-upload-a-docker-image.sh -l -b -c "${BINARY}" -d "cmd/${BINARY}" -p "${platforms}" -t release
6363
run_integration_test "localhost:5000/$repo"
6464

65-
# skip building and uploading real Docker images if it's not all-in-one
66-
if [[ "${BINARY}" != "all-in-one" ]]; then
67-
exit
68-
fi
69-
7065
# build all-in-one image and upload to dockerhub/quay.io
71-
bash scripts/build-upload-a-docker-image.sh -b -c all-in-one -d cmd/all-in-one -p "${platforms}" -t release
66+
bash scripts/build-upload-a-docker-image.sh -b -c "${BINARY}" -d "cmd/${BINARY}" -p "${platforms}" -t release
7267

7368
# build debug image if not on a pull request
7469
if [[ "${is_pull_request}" == "false" ]]; then
75-
make build-all-in-one GOOS=linux GOARCH="$GOARCH" DEBUG_BINARY=1
70+
make "build-${BINARY}" GOOS=linux GOARCH="$GOARCH" DEBUG_BINARY=1
7671
repo="${repo}-debug"
7772

78-
# build all-in-one DEBUG image locally for integration test
79-
bash scripts/build-upload-a-docker-image.sh -l -b -c all-in-one-debug -d cmd/all-in-one -t debug
73+
# build all-in-one DEBUG image locally for integration test (the -l switch)
74+
bash scripts/build-upload-a-docker-image.sh -l -b -c "${BINARY}-debug" -d "cmd/${BINARY}" -t debug
8075
run_integration_test "localhost:5000/$repo"
8176

8277
# build all-in-one-debug image and upload to dockerhub/quay.io
83-
bash scripts/build-upload-a-docker-image.sh -b -c all-in-one-debug -d cmd/all-in-one -t debug
78+
bash scripts/build-upload-a-docker-image.sh -b -c "${BINARY}-debug" -d "cmd/${BINARY}" -t debug
8479
fi

0 commit comments

Comments
 (0)