diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 470764e3..97d290aa 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,7 +34,7 @@ jobs: linux_distro: - Alpine Linux 3.21 # with musl - CentOS 8.2 # with GCC 8.5.0 - # - Debian Buster with GCC 9.2 # stock buster has GCC 8.3 - temporarily disabled + - Debian Bookworm with GCC 9.5 # stock bookworm has GCC 12.2 - Ubuntu 22.04 # because super popular - Ubuntu 25.04 # because GCC 15+ diff --git a/scripts/docker/build_on_debian_buster_with_gcc_9_2.Dockerfile b/scripts/docker/build_on_debian_bookworm_with_gcc_9_5.Dockerfile similarity index 92% rename from scripts/docker/build_on_debian_buster_with_gcc_9_2.Dockerfile rename to scripts/docker/build_on_debian_bookworm_with_gcc_9_5.Dockerfile index 802a3f05..52ceb4a9 100644 --- a/scripts/docker/build_on_debian_buster_with_gcc_9_2.Dockerfile +++ b/scripts/docker/build_on_debian_bookworm_with_gcc_9_5.Dockerfile @@ -14,10 +14,12 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -FROM gcc:9.2 +FROM gcc:9.5-bookworm SHELL ["/bin/bash", "-c"] RUN head -n1 /etc/os-release \ && \ + cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/local/lib64/ \ + && \ apt-get update \ && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes -V \ @@ -50,9 +52,9 @@ RUN head -n1 /etc/os-release \ xsltproc RUN set -x \ && \ - [[ "$(gcc -dumpversion) == 9.2.* ]] \ + [[ "$(gcc -dumpversion)" == 9.5.* ]] \ && \ - [[ "$(g++ -dumpversion) == 9.2.* ]] + [[ "$(g++ -dumpversion)" == 9.5.* ]] ADD usbguard.tar usbguard/ ADD catch.tar usbguard/src/ThirdParty/Catch/ WORKDIR usbguard