From b1d9777a73df99bd287204eaf5b9095fa7ed44da Mon Sep 17 00:00:00 2001 From: Nickolay Olshevsky Date: Tue, 11 Jun 2024 18:45:50 +0300 Subject: [PATCH 1/3] Add Fedora 40 container. --- .github/workflows/build-containers.yml | 1 + fedora-40-amd64.Dockerfile | 28 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 fedora-40-amd64.Dockerfile diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 8435e29..33b88cd 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -31,6 +31,7 @@ jobs: - 'fedora-36-amd64' - 'fedora-38-amd64' - 'fedora-39-amd64' + - 'fedora-40-amd64' - 'debian-11-amd64' - 'debian-12-amd64' - 'debian-11-i386' diff --git a/fedora-40-amd64.Dockerfile b/fedora-40-amd64.Dockerfile new file mode 100644 index 0000000..1c7b721 --- /dev/null +++ b/fedora-40-amd64.Dockerfile @@ -0,0 +1,28 @@ +FROM fedora:40 + +ENV LANG=C.UTF-8 +ENV LC_ALL=C.UTF-8 +ENV LC_LANG=C.UTF-8 +ENV ARCH=x64 +ENV CPU=x86_64 +ENV OS=linux +# For libiconv +ENV LD_LIBRARY_PATH=/usr/local/lib + +ARG CC=gcc +ARG CXX=g++ + +COPY tools /opt/tools + +RUN dnf -y update && \ + dnf -y install sudo wget git openssl-devel bison byacc cmake python perl-Digest-SHA \ + json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel \ + gettext-devel ncurses-devel zlib-devel asciidoctor botan2 botan2-devel llvm + +RUN /opt/tools/tools.sh build_and_install_libiconv && \ + /opt/tools/tools.sh build_and_install_gpg lts && \ + /opt/tools/tools.sh build_and_install_gpg stable && \ + /opt/tools/tools.sh build_and_install_botan 3.1.1 && \ + /opt/tools/tools.sh build_and_install_botan 3.2.0 && \ + /opt/tools/tools.sh build_and_install_botan 3.3.0 && \ + /opt/tools/tools.sh build_and_install_botan 3.4.0 From dbacd3f28eb78b3d5cd8f0ac77d90e8faaed559e Mon Sep 17 00:00:00 2001 From: Nickolay Olshevsky Date: Tue, 11 Jun 2024 18:46:08 +0300 Subject: [PATCH 2/3] Add Debian 12 i386 container. --- .github/workflows/build-containers.yml | 1 + debian-12-i386.Dockerfile | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 debian-12-i386.Dockerfile diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 33b88cd..f007f8f 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -36,6 +36,7 @@ jobs: - 'debian-12-amd64' - 'debian-11-i386' - 'debian-10-i386' + - 'debian-12-i386' - 'opensuse-leap' - 'opensuse-tumbleweed' diff --git a/debian-12-i386.Dockerfile b/debian-12-i386.Dockerfile new file mode 100644 index 0000000..a26fb57 --- /dev/null +++ b/debian-12-i386.Dockerfile @@ -0,0 +1,25 @@ +FROM i386/debian:12 + +ENV DEBIAN_FRONTEND=noninteractive +ENV LANG=C.UTF-8 +ENV LC_ALL=C.UTF-8 +ENV LC_LANG=.UTF-8 +ENV ARCH=ia32 +ENV CPU=i386 +ENV OS=linux +# For default botan version (2.18.3) +ENV LD_LIBRARY_PATH=/usr/local/lib + +ARG CC=gcc +ARG CXX=g++ + +COPY tools /opt/tools + +RUN apt-get update && \ + apt-get -y install git sudo wget bash software-properties-common pkg-config \ + build-essential gettext libbz2-dev libssl-dev zlib1g-dev \ + python3 python3-venv autoconf automake libtool asciidoctor clang libbotan-2-dev gpg + +RUN /opt/tools/tools.sh ensure_symlink_to_target '/usr/bin/python3' '/usr/bin/python' && \ + /opt/tools/tools.sh install_cmake && \ + /opt/tools/tools.sh build_and_install_jsonc From 4c984be2661b5f9d4b6050df1243feae4f2977be Mon Sep 17 00:00:00 2001 From: Nickolay Olshevsky Date: Tue, 11 Jun 2024 18:49:24 +0300 Subject: [PATCH 3/3] Remove EOLed containers. --- .github/workflows/build-containers.yml | 7 +----- centos-8-amd64.Dockerfile | 34 -------------------------- fedora-35-amd64.Dockerfile | 25 ------------------- fedora-36-amd64.Dockerfile | 27 -------------------- fedora-38-amd64.Dockerfile | 25 ------------------- 5 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 centos-8-amd64.Dockerfile delete mode 100644 fedora-35-amd64.Dockerfile delete mode 100644 fedora-36-amd64.Dockerfile delete mode 100644 fedora-38-amd64.Dockerfile diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index f007f8f..8bb3d5f 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -25,17 +25,12 @@ jobs: matrix: container: - 'centos-7-amd64' - - 'centos-8-amd64' - 'centos-9-amd64' - - 'fedora-35-amd64' - - 'fedora-36-amd64' - - 'fedora-38-amd64' - 'fedora-39-amd64' - 'fedora-40-amd64' - 'debian-11-amd64' - - 'debian-12-amd64' - 'debian-11-i386' - - 'debian-10-i386' + - 'debian-12-amd64' - 'debian-12-i386' - 'opensuse-leap' - 'opensuse-tumbleweed' diff --git a/centos-8-amd64.Dockerfile b/centos-8-amd64.Dockerfile deleted file mode 100644 index d03e7fc..0000000 --- a/centos-8-amd64.Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM tgagor/centos:stream8 - -ENV LANG=C.UTF-8 -ENV LC_ALL=C.UTF-8 -ENV LC_LANG=C.UTF-8 -ENV ARCH=x64 -ENV CPU=x86_64 -ENV OS=linux -# CXXFLAGS environment setting resolves dual ABI issues caused by BOTAN libraries with the version of GCC installed at 'tgagor/centos:stream8' -# https://gcc.gnu.org/onlinedocs/gcc-5.2.0/libstdc++/manual/manual/using_dual_abi.html -ENV CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 -# For libiconv -ENV LD_LIBRARY_PATH=/usr/local/lib - -ARG CC=gcc -ARG CXX=g++ - -COPY tools /opt/tools - -RUN dnf -y update && dnf -y install sudo wget git epel-release 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled powertools && \ - rpm --import https://github.com/riboseinc/yum/raw/master/ribose-packages.pub && \ - rpm --import https://github.com/riboseinc/yum/raw/master/ribose-packages-next.pub && \ - wget https://github.com/riboseinc/yum/raw/master/ribose.repo -O /etc/yum.repos.d/ribose.repo && \ - dnf -y install json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel \ - gettext-devel ncurses-devel zlib-devel python3 asciidoctor \ - openssl-devel bison byacc cmake gpg botan2 botan2-devel perl-Digest-SHA - -RUN /opt/tools/tools.sh ensure_symlink_to_target '/usr/bin/python3' '/usr/bin/python' && \ - /opt/tools/tools.sh build_and_install_automake && \ - /opt/tools/tools.sh build_and_install_libiconv && \ - /opt/tools/tools.sh build_and_install_gpg lts && \ - /opt/tools/tools.sh build_and_install_gpg stable && \ - /opt/tools/tools.sh build_and_install_botan 2.18.2 diff --git a/fedora-35-amd64.Dockerfile b/fedora-35-amd64.Dockerfile deleted file mode 100644 index f66345c..0000000 --- a/fedora-35-amd64.Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM fedora:35 - -ENV LANG=C.UTF-8 -ENV LC_ALL=C.UTF-8 -ENV LC_LANG=C.UTF-8 -ENV ARCH=x64 -ENV CPU=x86_64 -ENV OS=linux -# For libiconv -ENV LD_LIBRARY_PATH=/usr/local/lib - -ARG CC=gcc -ARG CXX=g++ - -COPY tools /opt/tools - -RUN dnf -y update && \ - dnf -y install sudo wget git openssl-devel bison byacc cmake python perl-Digest-SHA \ - json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel \ - gettext-devel ncurses-devel zlib-devel asciidoctor botan2 botan2-devel - -RUN /opt/tools/tools.sh build_and_install_automake && \ - /opt/tools/tools.sh build_and_install_libiconv && \ - /opt/tools/tools.sh build_and_install_gpg lts && \ - /opt/tools/tools.sh build_and_install_gpg stable diff --git a/fedora-36-amd64.Dockerfile b/fedora-36-amd64.Dockerfile deleted file mode 100644 index 0e583f4..0000000 --- a/fedora-36-amd64.Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM fedora:36 - -ENV LANG=C.UTF-8 -ENV LC_ALL=C.UTF-8 -ENV LC_LANG=C.UTF-8 -ENV ARCH=x64 -ENV CPU=x86_64 -ENV OS=linux -# For libiconv -ENV LD_LIBRARY_PATH=/usr/local/lib - -ARG CC=gcc -ARG CXX=g++ - -COPY tools /opt/tools - -RUN dnf -y update && \ - dnf -y install sudo wget git openssl-devel bison byacc cmake python perl-Digest-SHA \ - json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel \ - gettext-devel ncurses-devel zlib-devel asciidoctor botan2 botan2-devel llvm - -RUN /opt/tools/tools.sh build_and_install_libiconv && \ - /opt/tools/tools.sh build_and_install_gpg lts && \ - /opt/tools/tools.sh build_and_install_gpg stable && \ - /opt/tools/tools.sh build_and_install_botan 3.1.1 && \ - /opt/tools/tools.sh build_and_install_botan 3.2.0 && \ - /opt/tools/tools.sh build_and_install_botan 3.3.0 diff --git a/fedora-38-amd64.Dockerfile b/fedora-38-amd64.Dockerfile deleted file mode 100644 index 1d0cf7d..0000000 --- a/fedora-38-amd64.Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM fedora:38 - -ENV LANG=C.UTF-8 -ENV LC_ALL=C.UTF-8 -ENV LC_LANG=C.UTF-8 -ENV ARCH=x64 -ENV CPU=x86_64 -ENV OS=linux -# For libiconv -ENV LD_LIBRARY_PATH=/usr/local/lib - -ARG CC=gcc -ARG CXX=g++ - -COPY tools /opt/tools - -RUN dnf -y update && \ - dnf -y install sudo wget git openssl-devel bison byacc cmake python perl-Digest-SHA \ - json-c-devel clang gcc gcc-c++ make autoconf libtool gzip bzip2 bzip2-devel \ - gettext-devel ncurses-devel zlib-devel asciidoctor botan2 botan2-devel llvm - -RUN /opt/tools/tools.sh build_and_install_libiconv && \ - /opt/tools/tools.sh build_and_install_gpg lts && \ - /opt/tools/tools.sh build_and_install_gpg stable && \ - /opt/tools/tools.sh build_and_install_botan 3.4.0