Skip to content

Commit 7db9f5c

Browse files
committed
Use performance tool URL in Docker image
1 parent eb185ef commit 7db9f5c

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.github/workflows/build-push-stream-perf-test-docker-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ jobs:
3838
uses: docker/build-push-action@v2
3939
with:
4040
build-args: |
41-
stream_perf_test_version=${{ github.event.client_payload.version }}
41+
stream_perf_test_url=${{ github.event.client_payload.url }}
4242
push: true
4343
file: Dockerfile
4444
platforms: linux/amd64,linux/arm64
45-
tags: pivotalrabbitmq/stream-perf-test:latest
45+
tags: ${{ github.event.client_payload.tags }}

Dockerfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM ubuntu:20.04 as builder
22

3-
# from https://github.com/rabbitmq/rabbitmq-java-tools-binaries-dev/releases/
4-
ARG stream_perf_test_version="set-version-here"
3+
ARG stream_perf_test_url="set-url-here"
54

65
RUN set -eux; \
76
\
@@ -45,22 +44,19 @@ ENV STREAM_PERF_TEST_HOME="/stream_perf_test"
4544

4645
RUN set -eux; \
4746
\
48-
STREAM_PERF_TEST_URL=https://github.com/rabbitmq/rabbitmq-java-tools-binaries-dev/releases/download/v-stream-perf-test-$stream_perf_test_version/stream-perf-test-$stream_perf_test_version.jar; \
49-
STREAM_PERF_TEST_PATH="/usr/local/src/stream-perf-test-$stream_perf_test_version"; \
50-
\
51-
wget --progress dot:giga --output-document "$STREAM_PERF_TEST_PATH.jar.asc" "$STREAM_PERF_TEST_URL.asc"; \
52-
wget --progress dot:giga --output-document "$STREAM_PERF_TEST_PATH.jar" "$STREAM_PERF_TEST_URL"; \
53-
STREAM_PERF_TEST_SHA256="$(wget -qO- $STREAM_PERF_TEST_URL.sha256)"; \
54-
echo "$STREAM_PERF_TEST_SHA256 *$STREAM_PERF_TEST_PATH.jar" | sha256sum --check --strict -; \
47+
wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar.asc" "$stream_perf_test_url.asc"; \
48+
wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar" "$stream_perf_test_url"; \
49+
STREAM_PERF_TEST_SHA256="$(wget -qO- $stream_perf_test_url.sha256)"; \
50+
echo "$STREAM_PERF_TEST_SHA256 /usr/local/src/stream-perf-test.jar" | sha256sum --check --strict -; \
5551
\
5652
export GNUPGHOME="$(mktemp -d)"; \
5753
gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \
58-
gpg --batch --verify "$STREAM_PERF_TEST_PATH.jar.asc" "$STREAM_PERF_TEST_PATH.jar"; \
54+
gpg --batch --verify "/usr/local/src/stream-perf-test.jar.asc" "/usr/local/src/stream-perf-test.jar"; \
5955
gpgconf --kill all; \
6056
rm -rf "$GNUPGHOME"; \
6157
\
6258
mkdir -p "$STREAM_PERF_TEST_HOME"; \
63-
cp $STREAM_PERF_TEST_PATH.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
59+
cp /usr/local/src/stream-perf-test.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
6460

6561
FROM ubuntu:20.04
6662

0 commit comments

Comments
 (0)