Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove EOLed containers and add Debian 12 i386/Fedora 40 containers. #13

Merged
merged 3 commits into from
Jun 12, 2024
Merged

Remove EOLed containers and add Debian 12 i386/Fedora 40 containers. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1d9777
Add Fedora 40 container.
ni4 Jun 11, 2024
dbacd3f
Add Debian 12 i386 container.
ni4 Jun 11, 2024
4c984be
Remove EOLed containers.
ni4 Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/build-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,13 @@ 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'

Expand Down
34 changes: 0 additions & 34 deletions centos-8-amd64.Dockerfile
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions debian-12-i386.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
25 changes: 0 additions & 25 deletions fedora-35-amd64.Dockerfile
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions fedora-38-amd64.Dockerfile
View file
Open in desktop

This file was deleted.

55 changes: 28 additions & 27 deletions fedora-36-amd64.Dockerfile → fedora-40-amd64.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
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
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
Loading