Skip to content

Commit 7e8df65

Browse files
committed
Silence wget as recommended by hadolint.
1 parent ace0647 commit 7e8df65

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Dockerfile.rocky8

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,11 +540,11 @@ RUN if [ "$BUILD_MOD_AUTH_OPENID" = "True" -o "$ENABLE_SELF_SIGNED_CERTS" = "Tru
540540
&& yumdownloader -y --enablerepo=epel7-source --source --resolve --destdir /root/rpmbuild/SRPMS libopkele \
541541
&& rpm -ivh /root/rpmbuild/SRPMS/libopkele-*.src.rpm \
542542
# Optionally pull more recent gcc4.9 patch from Debian on rocky8+ (local copy in patches)
543-
&& wget -O /root/rpmbuild/SOURCES/fix-ftbfs-gcc4.9.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-ftbfs-gcc4.9.diff \
543+
&& wget -q -O /root/rpmbuild/SOURCES/fix-ftbfs-gcc4.9.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-ftbfs-gcc4.9.diff \
544544
# Pull the more recent required OpenSSL-1.1 patch from Debian on rocky8+ (local copy in patches)
545-
&& wget -O /root/rpmbuild/SOURCES/fix-openssl-1.1.0.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-openssl-1.1.0.diff \
545+
&& wget -q -O /root/rpmbuild/SOURCES/fix-openssl-1.1.0.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-openssl-1.1.0.diff \
546546
# Pull patch from own repo to rpmbuild with Debian patches on rocky8+ (local copy in patches)
547-
&& wget -O /tmp/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff https://github.com/ucphhpc/docker-migrid/raw/master/patches/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff \
547+
&& wget -q -O /tmp/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff https://github.com/ucphhpc/docker-migrid/raw/master/patches/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff \
548548
&& cd /root && patch -p 0 < /tmp/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff && cd - \
549549
# TODO: is this security crippling needed or a matter of proper apache proxying?
550550
# Disable Apache OpenID ssl-certificate verification if self-signed

Dockerfile.rocky9

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ RUN if [ "${WITH_PY3}" = "True" ]; then \
413413
python3-typing-extensions \
414414
# Patch python3-openid until our pull request makes it to the Rocky repo
415415
&& echo "Pull python3 openid patch from own repo" \
416-
&& wget -O /tmp/python3-openid-assoc_handle.patch.diff https://raw.githubusercontent.com/ucphhpc/docker-migrid/master/patches/python3-openid-assoc_handle.patch.diff \
416+
&& wget -q -O /tmp/python3-openid-assoc_handle.patch.diff https://raw.githubusercontent.com/ucphhpc/docker-migrid/master/patches/python3-openid-assoc_handle.patch.diff \
417417
&& patch -p 0 /usr/lib/python3.9/site-packages/openid/server/server.py < /tmp/python3-openid-assoc_handle.patch.diff \
418418
&& rm -f /tmp/python3-openid-assoc_handle.patch.diff \
419419
# NOTE: only install default paramiko if upgrade not requested
@@ -505,11 +505,11 @@ RUN if [ "$ENABLE_OPENID" = "True" ]; then \
505505
&& yumdownloader -y --enablerepo=epel7-source --source --resolve --destdir /root/rpmbuild/SRPMS libopkele \
506506
&& rpm -ivh /root/rpmbuild/SRPMS/libopkele-*.src.rpm \
507507
# Optionally pull more recent gcc4.9 patch from Debian on rocky8+ (local copy in patches)
508-
&& wget -O /root/rpmbuild/SOURCES/fix-ftbfs-gcc4.9.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-ftbfs-gcc4.9.diff \
508+
&& wget -q -O /root/rpmbuild/SOURCES/fix-ftbfs-gcc4.9.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-ftbfs-gcc4.9.diff \
509509
# Pull the more recent required OpenSSL-1.1 patch from Debian on rocky8+ (local copy in patches)
510-
&& wget -O /root/rpmbuild/SOURCES/fix-openssl-1.1.0.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-openssl-1.1.0.diff \
510+
&& wget -q -O /root/rpmbuild/SOURCES/fix-openssl-1.1.0.diff https://sources.debian.org/data/main/libo/libopkele/2.0.4%2Bgit20140305.9651b55-4/debian/patches/fix-openssl-1.1.0.diff \
511511
# Pull patch from own repo to rpmbuild with Debian patches on rocky8+ (local copy in patches)
512-
&& wget -O /tmp/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff https://github.com/ucphhpc/docker-migrid/raw/master/patches/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff \
512+
&& wget -q -O /tmp/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff https://github.com/ucphhpc/docker-migrid/raw/master/patches/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff \
513513
&& cd /root && patch -p 0 < /tmp/rpmbuild-opkele-with-gcc4.9-openssl-1.1.0-patches.diff && cd - \
514514
&& rpmbuild -v -ba /root/rpmbuild/SPECS/libopkele.spec \
515515
&& rm -f /root/rpmbuild/RPMS/*/libopkele-*debug*.rpm \

0 commit comments

Comments
 (0)