Skip to content

Commit aeb4340

Browse files
committed
Fix Dockerfile
1 parent bc0c32f commit aeb4340

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

Dockerfile

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,21 @@ ARG PGP_KEYSERVER=hkps://keys.openpgp.org
4343
ENV RABBITMQ_PGP_KEY_ID="0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
4444
ENV STREAM_PERF_TEST_HOME="/stream_perf_test"
4545

46-
#RUN set -eux; \
47-
# \
48-
# wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar.asc" "$stream_perf_test_url.asc"; \
49-
# wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar" "$stream_perf_test_url"; \
50-
# STREAM_PERF_TEST_SHA256="$(wget -qO- $stream_perf_test_url.sha256)"; \
51-
# echo "$STREAM_PERF_TEST_SHA256 /usr/local/src/stream-perf-test.jar" | sha256sum --check --strict -; \
52-
# \
53-
# export GNUPGHOME="$(mktemp -d)"; \
54-
# gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \
55-
# gpg --batch --verify "/usr/local/src/stream-perf-test.jar.asc" "/usr/local/src/stream-perf-test.jar"; \
56-
# gpgconf --kill all; \
57-
# rm -rf "$GNUPGHOME"; \
58-
# \
59-
# mkdir -p "$STREAM_PERF_TEST_HOME"; \
60-
# cp /usr/local/src/stream-perf-test.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
61-
62-
COPY target/stream-perf-test.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
46+
RUN set -eux; \
47+
\
48+
wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar.asc" "$stream_perf_test_url.asc"; \
49+
wget --progress dot:giga --output-document "/usr/local/src/stream-perf-test.jar" "$stream_perf_test_url"; \
50+
STREAM_PERF_TEST_SHA256="$(wget -qO- $stream_perf_test_url.sha256)"; \
51+
echo "$STREAM_PERF_TEST_SHA256 /usr/local/src/stream-perf-test.jar" | sha256sum --check --strict -; \
52+
\
53+
export GNUPGHOME="$(mktemp -d)"; \
54+
gpg --batch --keyserver "$PGP_KEYSERVER" --recv-keys "$RABBITMQ_PGP_KEY_ID"; \
55+
gpg --batch --verify "/usr/local/src/stream-perf-test.jar.asc" "/usr/local/src/stream-perf-test.jar"; \
56+
gpgconf --kill all; \
57+
rm -rf "$GNUPGHOME"; \
58+
\
59+
mkdir -p "$STREAM_PERF_TEST_HOME"; \
60+
cp /usr/local/src/stream-perf-test.jar $STREAM_PERF_TEST_HOME/stream-perf-test.jar
6361

6462
FROM ubuntu:22.04
6563

@@ -70,7 +68,6 @@ RUN set -eux; \
7068
apt-get install -y --no-install-recommends \
7169
locales \
7270
wget \
73-
jq \
7471
; \
7572
rm -rf /var/lib/apt/lists/*; \
7673
locale-gen en_US.UTF-8
@@ -96,4 +93,4 @@ RUN useradd --uid 1000 --gid stream-perf-test --comment "perf-test user" stream-
9693

9794
USER stream-perf-test:stream-perf-test
9895

99-
ENTRYPOINT ["java", "-Dio.netty.processId=1", "-jar", "stream-perf-test.jar"]
96+
ENTRYPOINT ["java", "-Dio.netty.processId=1", "-jar", "stream-perf-test.jar"]

0 commit comments

Comments
 (0)