mirror of https://github.com/status-im/consul.git
Fix curl vs curl-minimail install conflict in ubi9 image (#15808)
ubi9 already has curl-minimal installed. Attempting to install curl results in a microdnf conflict and errors out.
This commit is contained in:
parent
20f9e606b2
commit
2884090570
|
@ -233,7 +233,7 @@ COPY LICENSE /licenses/mozilla.txt
|
||||||
# Its shasum is hardcoded. If you upgrade the dumb-init verion you'll need to
|
# Its shasum is hardcoded. If you upgrade the dumb-init verion you'll need to
|
||||||
# also update the shasum.
|
# also update the shasum.
|
||||||
RUN set -eux && \
|
RUN set -eux && \
|
||||||
microdnf install -y ca-certificates curl gnupg libcap openssl iputils jq iptables wget unzip tar && \
|
microdnf install -y ca-certificates gnupg libcap openssl iputils jq iptables wget unzip tar && \
|
||||||
wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 && \
|
wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64 && \
|
||||||
echo 'e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df /usr/bin/dumb-init' > dumb-init-shasum && \
|
echo 'e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df /usr/bin/dumb-init' > dumb-init-shasum && \
|
||||||
sha256sum --check dumb-init-shasum && \
|
sha256sum --check dumb-init-shasum && \
|
||||||
|
|
Loading…
Reference in New Issue