From 4da350b0149f0dd151790f768c21d2ec6627ef80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 7 May 2024 12:43:22 +0000 Subject: [PATCH] Test build for #1092 --- gcc-13-image/Dockerfile | 4 ++-- gcc-7-image/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc-13-image/Dockerfile b/gcc-13-image/Dockerfile index fe08344b6..3ab1b1b95 100644 --- a/gcc-13-image/Dockerfile +++ b/gcc-13-image/Dockerfile @@ -42,11 +42,11 @@ LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterpri LABEL com.suse.release-stage="beta" # endlabelprefix -RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; zypper -n in --no-recommends gcc13 gcc13-c++ make gawk; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} ENV GCC_VERSION="%%gcc_version%%" # symlink all versioned gcc & g++ binaries to unversioned # ones in /usr/local/bin so that plain gcc works RUN set -euo pipefail; for gcc_bin in $(rpm -ql gcc13 gcc13-c++ |grep ^/usr/bin/ ); do \ - ln -f $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-13$||'); \ + ln -sf $gcc_bin $(echo "$gcc_bin" | sed -e 's|/usr/bin/|/usr/local/bin/|' -e 's|-13$||'); \ done diff --git a/gcc-7-image/Dockerfile b/gcc-7-image/Dockerfile index b0210a12c..02051c145 100644 --- a/gcc-7-image/Dockerfile +++ b/gcc-7-image/Dockerfile @@ -42,6 +42,6 @@ LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterpri LABEL com.suse.release-stage="beta" # endlabelprefix -RUN set -euo pipefail; zypper -n in --no-recommends gcc7 gcc7-c++ make gcc gcc-c++; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; zypper -n in --no-recommends gcc7 gcc7-c++ make gawk gcc gcc-c++; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} ENV GCC_VERSION="%%gcc_version%%"