@@ -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