From 9ca928de51edb6ea205e9332c0c8df7d31064b3d Mon Sep 17 00:00:00 2001 From: Maria Matejka Date: Fri, 10 Jan 2025 18:09:01 +0100 Subject: [PATCH] Update build and package targets Fedora builds for 32-41, Debian up to 12, Ubuntu up to 24.10. Includes autorebuilder if a Dockerfile changes. The CI file is obnoxiously boilerplaty. TODO: generate it from a list? --- .gitlab-ci.yml | 322 ++++++++++++++---- misc/docker/centos-6-amd64/Dockerfile | 11 - misc/docker/debian-11-i386/Dockerfile | 2 +- .../Dockerfile | 8 +- misc/docker/debian-12-i386/Dockerfile | 25 ++ misc/docker/debian-7-amd64/Dockerfile | 13 - misc/docker/debian-7-i386/Dockerfile | 13 - misc/docker/debian-8-amd64/Dockerfile | 12 - misc/docker/debian-8-i386/Dockerfile | 12 - misc/docker/debian-testing-amd64/Dockerfile | 1 - misc/docker/debian-testing-i386/Dockerfile | 1 - misc/docker/fedora-25-amd64/Dockerfile | 11 - misc/docker/fedora-26-amd64/Dockerfile | 11 - misc/docker/fedora-27-amd64/Dockerfile | 11 - misc/docker/fedora-28-amd64/Dockerfile | 11 - misc/docker/fedora-29-amd64/Dockerfile | 11 - .../Dockerfile | 4 +- .../Dockerfile | 4 +- .../Dockerfile | 10 +- misc/docker/fedora-38-amd64/Dockerfile | 18 + misc/docker/fedora-39-amd64/Dockerfile | 18 + misc/docker/fedora-40-amd64/Dockerfile | 18 + misc/docker/fedora-41-amd64/Dockerfile | 18 + .../Dockerfile | 4 +- misc/docker/ubuntu-24.04-amd64/Dockerfile | 27 ++ misc/docker/ubuntu-24.10-amd64/Dockerfile | 27 ++ 26 files changed, 430 insertions(+), 193 deletions(-) delete mode 100644 misc/docker/centos-6-amd64/Dockerfile rename misc/docker/{ubuntu-21.10-amd64 => debian-12-amd64}/Dockerfile (74%) create mode 100644 misc/docker/debian-12-i386/Dockerfile delete mode 100644 misc/docker/debian-7-amd64/Dockerfile delete mode 100644 misc/docker/debian-7-i386/Dockerfile delete mode 100644 misc/docker/debian-8-amd64/Dockerfile delete mode 100644 misc/docker/debian-8-i386/Dockerfile delete mode 100644 misc/docker/fedora-25-amd64/Dockerfile delete mode 100644 misc/docker/fedora-26-amd64/Dockerfile delete mode 100644 misc/docker/fedora-27-amd64/Dockerfile delete mode 100644 misc/docker/fedora-28-amd64/Dockerfile delete mode 100644 misc/docker/fedora-29-amd64/Dockerfile rename misc/docker/{fedora-30-amd64 => fedora-35-amd64}/Dockerfile (86%) rename misc/docker/{fedora-31-amd64 => fedora-36-amd64}/Dockerfile (86%) rename misc/docker/{centos-7-amd64 => fedora-37-amd64}/Dockerfile (61%) create mode 100644 misc/docker/fedora-38-amd64/Dockerfile create mode 100644 misc/docker/fedora-39-amd64/Dockerfile create mode 100644 misc/docker/fedora-40-amd64/Dockerfile create mode 100644 misc/docker/fedora-41-amd64/Dockerfile rename misc/docker/{ubuntu-21.04-amd64 => ubuntu-22.04-amd64}/Dockerfile (82%) create mode 100644 misc/docker/ubuntu-24.04-amd64/Dockerfile create mode 100644 misc/docker/ubuntu-24.10-amd64/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43f517cb0..1e84f670f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,16 +8,15 @@ variables: STAYRTR_BINARY: /usr/bin/stayrtr stages: -# - image + - image - build - pkg - test .docker: &docker_build stage: image - allow_failure: true script: - - $DOCKER_CMD login -u gitlab-ci-token -p $CI_BUILD_TOKEN registry.nic.cz + - $DOCKER_CMD login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.nic.cz # Make sure we refresh the base image if it updates (eg. security updates, etc) # If we do just the build, cache is always reused and the freshness of the # base image is never checked. However, pull always asks and updates the @@ -32,12 +31,167 @@ stages: tags: # That's Docker in Docker - dind + rules: + - changes: + # Do any change in Dockerfile (e.g. change a comment) to rebuild the image + - misc/docker/$IMG_NAME/Dockerfile + when: always + - when: never + +docker-debian-9-amd64: + variables: + IMG_NAME: "debian-9-amd64" + <<: *docker_build -# Docker build example -#docker_debian-11-amd64: -# variables: -# IMG_NAME: "debian-11-amd64" -# <<: *docker_build +docker-debian-9-i386: + variables: + IMG_NAME: "debian-9-i386" + <<: *docker_build + +docker-debian-10-amd64: + variables: + IMG_NAME: "debian-10-amd64" + <<: *docker_build + +docker-debian-10-i386: + variables: + IMG_NAME: "debian-10-i386" + <<: *docker_build + +docker-debian-11-amd64: + variables: + IMG_NAME: "debian-11-amd64" + <<: *docker_build + +docker-debian-11-i386: + variables: + IMG_NAME: "debian-11-i386" + <<: *docker_build + +docker-debian-12-amd64: + variables: + IMG_NAME: "debian-12-amd64" + <<: *docker_build + +docker-debian-12-i386: + variables: + IMG_NAME: "debian-12-i386" + <<: *docker_build + +docker-debian-testing-amd64: + variables: + IMG_NAME: "debian-testing-amd64" + <<: *docker_build + +docker-debian-testing-i386: + variables: + IMG_NAME: "debian-testing-i386" + <<: *docker_build + +docker-fedora-32-amd64: + variables: + IMG_NAME: "fedora-32-amd64" + <<: *docker_build + +docker-fedora-33-amd64: + variables: + IMG_NAME: "fedora-33-amd64" + <<: *docker_build + +docker-fedora-34-amd64: + variables: + IMG_NAME: "fedora-34-amd64" + <<: *docker_build + +docker-fedora-35-amd64: + variables: + IMG_NAME: "fedora-35-amd64" + <<: *docker_build + +docker-fedora-36-amd64: + variables: + IMG_NAME: "fedora-36-amd64" + <<: *docker_build + +docker-fedora-37-amd64: + variables: + IMG_NAME: "fedora-37-amd64" + <<: *docker_build + +docker-fedora-38-amd64: + variables: + IMG_NAME: "fedora-38-amd64" + <<: *docker_build + +docker-fedora-39-amd64: + variables: + IMG_NAME: "fedora-39-amd64" + <<: *docker_build + +docker-fedora-40-amd64: + variables: + IMG_NAME: "fedora-40-amd64" + <<: *docker_build + +docker-fedora-41-amd64: + variables: + IMG_NAME: "fedora-41-amd64" + <<: *docker_build + +docker-centos-8-amd64: + variables: + IMG_NAME: "centos-8-amd64" + <<: *docker_build + +docker-ubuntu-16_04-amd64: + variables: + IMG_NAME: "ubuntu-16.04-amd64" + <<: *docker_build + +docker-ubuntu-18_04-amd64: + variables: + IMG_NAME: "ubuntu-18.04-amd64" + <<: *docker_build + +docker-ubuntu-20_04-amd64: + variables: + IMG_NAME: "ubuntu-20.04-amd64" + <<: *docker_build + +docker-ubuntu-22_04-amd64: + variables: + IMG_NAME: "ubuntu-22.04-amd64" + <<: *docker_build + +docker-ubuntu-24_04-amd64: + variables: + IMG_NAME: "ubuntu-24.04-amd64" + <<: *docker_build + +docker-ubuntu-24_10-amd64: + variables: + IMG_NAME: "ubuntu-24.10-amd64" + <<: *docker_build + +docker-opensuse-15.0-amd64: + variables: + IMG_NAME: "opensuse-15.0-amd64" + <<: *docker_build + +docker-opensuse-15.1-amd64: + variables: + IMG_NAME: "opensuse-15.1-amd64" + <<: *docker_build + +docker-opensuse-15.2-amd64: + variables: + IMG_NAME: "opensuse-15.2-amd64" + <<: *docker_build + +docker-opensuse-15.3-amd64: + variables: + IMG_NAME: "opensuse-15.3-amd64" + <<: *docker_build .build: &build-base @@ -80,61 +234,65 @@ build-debian-11-amd64: <<: *build-linux image: registry.nic.cz/labs/bird:debian-11-amd64 -#build-debian-11-i386: -# <<: *build-linux -# image: registry.nic.cz/labs/bird:debian-11-i386 +build-debian-11-i386: + <<: *build-linux + image: registry.nic.cz/labs/bird:debian-11-i386 + +build-debian-12-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:debian-12-amd64 + +build-debian-12-i386: + <<: *build-linux + image: registry.nic.cz/labs/bird:debian-12-i386 build-debian-testing-amd64: <<: *build-linux image: registry.nic.cz/labs/bird:debian-testing-amd64 -#build-debian-testing-i386: -# <<: *build-linux -# image: registry.nic.cz/labs/bird:debian-testing-i386 - -build-fedora-25-amd64: +build-debian-testing-i386: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-25-amd64 + image: registry.nic.cz/labs/bird:debian-testing-i386 -build-fedora-26-amd64: +build-fedora-32-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-26-amd64 + image: registry.nic.cz/labs/bird:fedora-32-amd64 -build-fedora-27-amd64: +build-fedora-33-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-27-amd64 + image: registry.nic.cz/labs/bird:fedora-33-amd64 -build-fedora-28-amd64: +build-fedora-34-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-28-amd64 + image: registry.nic.cz/labs/bird:fedora-34-amd64 -build-fedora-29-amd64: +build-fedora-35-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-29-amd64 + image: registry.nic.cz/labs/bird:fedora-35-amd64 -build-fedora-30-amd64: +build-fedora-36-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-30-amd64 + image: registry.nic.cz/labs/bird:fedora-36-amd64 -build-fedora-31-amd64: +build-fedora-37-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-31-amd64 + image: registry.nic.cz/labs/bird:fedora-37-amd64 -build-fedora-32-amd64: +build-fedora-38-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-32-amd64 + image: registry.nic.cz/labs/bird:fedora-38-amd64 -build-fedora-33-amd64: +build-fedora-39-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-33-amd64 + image: registry.nic.cz/labs/bird:fedora-39-amd64 -build-fedora-34-amd64: +build-fedora-40-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:fedora-33-amd64 + image: registry.nic.cz/labs/bird:fedora-40-amd64 -#build-centos-7-amd64: -# <<: *build-linux -# image: registry.nic.cz/labs/bird:centos-7-amd64 +build-fedora-41-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:fedora-41-amd64 build-centos-8-amd64: <<: *build-linux @@ -152,13 +310,17 @@ build-ubuntu-20_04-amd64: <<: *build-linux image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 -build-ubuntu-21_10-amd64: +build-ubuntu-22_04-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64 + +build-ubuntu-24_04-amd64: <<: *build-linux - image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64 + image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64 -#build-ubuntu-21_04-amd64: -# <<: *build-linux -# image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64 +build-ubuntu-24_10-amd64: + <<: *build-linux + image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64 build-opensuse-15.0-amd64: <<: *build-linux @@ -235,15 +397,20 @@ pkg-debian-11-amd64: needs: [build-debian-11-amd64] image: registry.nic.cz/labs/bird:debian-11-amd64 -pkg-fedora-30-amd64: - <<: *pkg-rpm-wa - needs: [build-fedora-30-amd64] - image: registry.nic.cz/labs/bird:fedora-30-amd64 +pkg-debian-11-i386: + <<: *pkg-deb + needs: [build-debian-11-i386] + image: registry.nic.cz/labs/bird:debian-11-i386 -pkg-fedora-31-amd64: - <<: *pkg-rpm-wa - needs: [build-fedora-31-amd64] - image: registry.nic.cz/labs/bird:fedora-31-amd64 +pkg-debian-12-amd64: + <<: *pkg-deb + needs: [build-debian-12-amd64] + image: registry.nic.cz/labs/bird:debian-12-amd64 + +pkg-debian-12-i386: + <<: *pkg-deb + needs: [build-debian-12-i386] + image: registry.nic.cz/labs/bird:debian-12-i386 pkg-fedora-32-amd64: <<: *pkg-rpm-wa @@ -260,6 +427,41 @@ pkg-fedora-34-amd64: needs: [build-fedora-34-amd64] image: registry.nic.cz/labs/bird:fedora-34-amd64 +pkg-fedora-35-amd64: + <<: *pkg-rpm + needs: [build-fedora-35-amd64] + image: registry.nic.cz/labs/bird:fedora-35-amd64 + +pkg-fedora-36-amd64: + <<: *pkg-rpm + needs: [build-fedora-36-amd64] + image: registry.nic.cz/labs/bird:fedora-36-amd64 + +pkg-fedora-37-amd64: + <<: *pkg-rpm + needs: [build-fedora-37-amd64] + image: registry.nic.cz/labs/bird:fedora-37-amd64 + +pkg-fedora-38-amd64: + <<: *pkg-rpm + needs: [build-fedora-38-amd64] + image: registry.nic.cz/labs/bird:fedora-38-amd64 + +pkg-fedora-39-amd64: + <<: *pkg-rpm + needs: [build-fedora-39-amd64] + image: registry.nic.cz/labs/bird:fedora-39-amd64 + +pkg-fedora-40-amd64: + <<: *pkg-rpm + needs: [build-fedora-40-amd64] + image: registry.nic.cz/labs/bird:fedora-40-amd64 + +pkg-fedora-41-amd64: + <<: *pkg-rpm + needs: [build-fedora-41-amd64] + image: registry.nic.cz/labs/bird:fedora-41-amd64 + #pkg-centos-7-amd64: # <<: *pkg-rpm-wa # variables: @@ -282,16 +484,20 @@ pkg-ubuntu-20.04-amd64: needs: [build-ubuntu-20_04-amd64] image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 +pkg-ubuntu-22.04-amd64: + <<: *pkg-deb + needs: [build-ubuntu-22_04-amd64] + image: registry.nic.cz/labs/bird:ubuntu-22.04-amd64 -pkg-ubuntu-21.10-amd64: +pkg-ubuntu-24.04-amd64: <<: *pkg-deb - needs: [build-ubuntu-21_10-amd64] - image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64 + needs: [build-ubuntu-24_04-amd64] + image: registry.nic.cz/labs/bird:ubuntu-24.04-amd64 -#pkg-ubuntu-21.04-amd64: -# <<: *pkg-deb -# needs: [build-ubuntu-21_04-amd64] -# image: registry.nic.cz/labs/bird:ubuntu-21.04-amd64 +pkg-ubuntu-24.10-amd64: + <<: *pkg-deb + needs: [build-ubuntu-24_10-amd64] + image: registry.nic.cz/labs/bird:ubuntu-24.10-amd64 pkg-opensuse-15.1-amd64: <<: *pkg-rpm-wa diff --git a/misc/docker/centos-6-amd64/Dockerfile b/misc/docker/centos-6-amd64/Dockerfile deleted file mode 100644 index d92f64f9d..000000000 --- a/misc/docker/centos-6-amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM centos:6 -RUN yum -y upgrade -RUN yum -y install \ - autoconf \ - flex \ - bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc \ - make diff --git a/misc/docker/debian-11-i386/Dockerfile b/misc/docker/debian-11-i386/Dockerfile index 5b5ad5a36..1edb4579c 100644 --- a/misc/docker/debian-11-i386/Dockerfile +++ b/misc/docker/debian-11-i386/Dockerfile @@ -1,6 +1,6 @@ +# bump number for image rebuild: 1 FROM i386/debian:bullseye-slim ENV DEBIAN_FRONTEND=noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN apt-get -y update && apt-get -y upgrade RUN apt-get -y --no-install-recommends install \ build-essential \ diff --git a/misc/docker/ubuntu-21.10-amd64/Dockerfile b/misc/docker/debian-12-amd64/Dockerfile similarity index 74% rename from misc/docker/ubuntu-21.10-amd64/Dockerfile rename to misc/docker/debian-12-amd64/Dockerfile index aa0987b64..3c6b43dd6 100644 --- a/misc/docker/ubuntu-21.10-amd64/Dockerfile +++ b/misc/docker/debian-12-amd64/Dockerfile @@ -1,10 +1,9 @@ -FROM ubuntu:21.10 +# bump number for image rebuild: 2 +FROM amd64/debian:bookworm-slim ENV DEBIAN_FRONTEND=noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN apt-get -y update RUN apt-get -y upgrade RUN apt-get -y --no-install-recommends install \ - tzdata \ build-essential \ flex \ bison \ @@ -17,11 +16,10 @@ RUN apt-get -y --no-install-recommends install \ opensp \ docbook-xsl \ xsltproc -RUN apt-get -y install \ +RUN apt-get -y --no-install-recommends install \ git \ dpkg-dev \ debhelper \ - apt-utils \ quilt \ python3 \ python3-pip \ diff --git a/misc/docker/debian-12-i386/Dockerfile b/misc/docker/debian-12-i386/Dockerfile new file mode 100644 index 000000000..414178f12 --- /dev/null +++ b/misc/docker/debian-12-i386/Dockerfile @@ -0,0 +1,25 @@ +# bump number for image rebuild: 1 +FROM i386/debian:bookworm-slim +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get -y update && apt-get -y upgrade +RUN apt-get -y --no-install-recommends install \ + build-essential \ + flex \ + bison \ + autoconf \ + ncurses-dev \ + libreadline-dev \ + libssh-gcrypt-dev \ + linuxdoc-tools-latex \ + texlive-latex-extra \ + opensp \ + docbook-xsl \ + xsltproc +RUN apt-get -y --no-install-recommends install \ + git \ + dpkg-dev \ + debhelper \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/docker/debian-7-amd64/Dockerfile b/misc/docker/debian-7-amd64/Dockerfile deleted file mode 100644 index 9510e9cf5..000000000 --- a/misc/docker/debian-7-amd64/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM debian:wheezy-slim -ENV DEBIAN_FRONTEND noninteractive -RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list -RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list -RUN apt-get -y update -o Acquire::Check-Valid-Until=false -RUN apt-get -y upgrade -RUN apt-get -y install \ - build-essential \ - flex \ - bison \ - autoconf \ - ncurses-dev \ - libreadline-dev diff --git a/misc/docker/debian-7-i386/Dockerfile b/misc/docker/debian-7-i386/Dockerfile deleted file mode 100644 index d47d8e08a..000000000 --- a/misc/docker/debian-7-i386/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM i386/debian:wheezy-slim -ENV DEBIAN_FRONTEND noninteractive -RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list -RUN echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list -RUN apt-get -y update -o Acquire::Check-Valid-Until=false -RUN apt-get -y upgrade -RUN apt-get -y install \ - build-essential \ - flex \ - bison \ - autoconf \ - ncurses-dev \ - libreadline-dev diff --git a/misc/docker/debian-8-amd64/Dockerfile b/misc/docker/debian-8-amd64/Dockerfile deleted file mode 100644 index d95201327..000000000 --- a/misc/docker/debian-8-amd64/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM debian:jessie-slim -ENV DEBIAN_FRONTEND noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list -RUN apt-get -y update -RUN apt-get -y upgrade -RUN apt-get -y install \ - build-essential \ - flex \ - bison \ - autoconf \ - ncurses-dev \ - libreadline-dev diff --git a/misc/docker/debian-8-i386/Dockerfile b/misc/docker/debian-8-i386/Dockerfile deleted file mode 100644 index 349fcee98..000000000 --- a/misc/docker/debian-8-i386/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM i386/debian:jessie-slim -ENV DEBIAN_FRONTEND noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list -RUN apt-get -y update -RUN apt-get -y upgrade -RUN apt-get -y install \ - build-essential \ - flex \ - bison \ - autoconf \ - ncurses-dev \ - libreadline-dev diff --git a/misc/docker/debian-testing-amd64/Dockerfile b/misc/docker/debian-testing-amd64/Dockerfile index 6d7bbbeba..e377cf321 100644 --- a/misc/docker/debian-testing-amd64/Dockerfile +++ b/misc/docker/debian-testing-amd64/Dockerfile @@ -1,6 +1,5 @@ FROM debian:testing-slim ENV DEBIAN_FRONTEND noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN apt-get -y update RUN apt-get -y upgrade RUN apt-get -y install \ diff --git a/misc/docker/debian-testing-i386/Dockerfile b/misc/docker/debian-testing-i386/Dockerfile index 3d6a969cc..1c16c0fa0 100644 --- a/misc/docker/debian-testing-i386/Dockerfile +++ b/misc/docker/debian-testing-i386/Dockerfile @@ -1,6 +1,5 @@ FROM i386/debian:testing-slim ENV DEBIAN_FRONTEND noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN apt-get -y update RUN apt-get -y upgrade RUN apt-get -y install \ diff --git a/misc/docker/fedora-25-amd64/Dockerfile b/misc/docker/fedora-25-amd64/Dockerfile deleted file mode 100644 index d0dd8f6f3..000000000 --- a/misc/docker/fedora-25-amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:25 -RUN dnf -y upgrade -RUN dnf -y install \ - make \ - autoconf \ - flex \ - bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc diff --git a/misc/docker/fedora-26-amd64/Dockerfile b/misc/docker/fedora-26-amd64/Dockerfile deleted file mode 100644 index f15ba40c9..000000000 --- a/misc/docker/fedora-26-amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:26 -RUN dnf -y upgrade -RUN dnf -y install \ - make \ - autoconf \ - flex \ - bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc diff --git a/misc/docker/fedora-27-amd64/Dockerfile b/misc/docker/fedora-27-amd64/Dockerfile deleted file mode 100644 index e31745916..000000000 --- a/misc/docker/fedora-27-amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:27 -RUN dnf -y upgrade -RUN dnf -y install \ - make \ - autoconf \ - flex \ - bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc diff --git a/misc/docker/fedora-28-amd64/Dockerfile b/misc/docker/fedora-28-amd64/Dockerfile deleted file mode 100644 index 0aa2f74a3..000000000 --- a/misc/docker/fedora-28-amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:28 -RUN dnf -y upgrade -RUN dnf -y install \ - make \ - autoconf \ - flex \ - bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc diff --git a/misc/docker/fedora-29-amd64/Dockerfile b/misc/docker/fedora-29-amd64/Dockerfile deleted file mode 100644 index afc1f0c0d..000000000 --- a/misc/docker/fedora-29-amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora:29 -RUN dnf -y upgrade -RUN dnf -y install \ - make \ - autoconf \ - flex \ - bison \ - pkgconfig \ - 'readline-devel' \ - 'pkgconfig(ncurses)' \ - gcc diff --git a/misc/docker/fedora-30-amd64/Dockerfile b/misc/docker/fedora-35-amd64/Dockerfile similarity index 86% rename from misc/docker/fedora-30-amd64/Dockerfile rename to misc/docker/fedora-35-amd64/Dockerfile index d9aaa62a2..dee5d2469 100644 --- a/misc/docker/fedora-30-amd64/Dockerfile +++ b/misc/docker/fedora-35-amd64/Dockerfile @@ -1,5 +1,5 @@ -FROM fedora:30 -RUN dnf -y update +FROM fedora:35 +RUN dnf -y upgrade RUN dnf -y install \ gcc \ make \ diff --git a/misc/docker/fedora-31-amd64/Dockerfile b/misc/docker/fedora-36-amd64/Dockerfile similarity index 86% rename from misc/docker/fedora-31-amd64/Dockerfile rename to misc/docker/fedora-36-amd64/Dockerfile index 9f7ad0cd7..cb84e3c73 100644 --- a/misc/docker/fedora-31-amd64/Dockerfile +++ b/misc/docker/fedora-36-amd64/Dockerfile @@ -1,5 +1,5 @@ -FROM fedora:31 -RUN dnf -y update +FROM fedora:36 +RUN dnf -y upgrade RUN dnf -y install \ gcc \ make \ diff --git a/misc/docker/centos-7-amd64/Dockerfile b/misc/docker/fedora-37-amd64/Dockerfile similarity index 61% rename from misc/docker/centos-7-amd64/Dockerfile rename to misc/docker/fedora-37-amd64/Dockerfile index bef04b00a..e6cbd7f5b 100644 --- a/misc/docker/centos-7-amd64/Dockerfile +++ b/misc/docker/fedora-37-amd64/Dockerfile @@ -1,6 +1,6 @@ -FROM centos:7 -RUN yum -y upgrade -RUN yum -y install \ +FROM fedora:37 +RUN dnf -y upgrade +RUN dnf -y install \ gcc \ make \ flex \ @@ -9,10 +9,10 @@ RUN yum -y install \ libssh-devel \ ncurses-devel \ readline-devel -RUN yum -y install \ +RUN dnf -y install \ git \ rpm-build \ - systemd \ + systemd-rpm-macros \ python3 \ python3-pip \ python3-setuptools diff --git a/misc/docker/fedora-38-amd64/Dockerfile b/misc/docker/fedora-38-amd64/Dockerfile new file mode 100644 index 000000000..5f889b848 --- /dev/null +++ b/misc/docker/fedora-38-amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM fedora:38 +RUN dnf -y upgrade +RUN dnf -y install \ + gcc \ + make \ + flex \ + bison \ + autoconf \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/docker/fedora-39-amd64/Dockerfile b/misc/docker/fedora-39-amd64/Dockerfile new file mode 100644 index 000000000..1e0c812ec --- /dev/null +++ b/misc/docker/fedora-39-amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM fedora:39 +RUN dnf -y upgrade +RUN dnf -y install \ + gcc \ + make \ + flex \ + bison \ + autoconf \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/docker/fedora-40-amd64/Dockerfile b/misc/docker/fedora-40-amd64/Dockerfile new file mode 100644 index 000000000..786385fea --- /dev/null +++ b/misc/docker/fedora-40-amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM fedora:40 +RUN dnf -y upgrade +RUN dnf -y install \ + gcc \ + make \ + flex \ + bison \ + autoconf \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/docker/fedora-41-amd64/Dockerfile b/misc/docker/fedora-41-amd64/Dockerfile new file mode 100644 index 000000000..e3f3a89b5 --- /dev/null +++ b/misc/docker/fedora-41-amd64/Dockerfile @@ -0,0 +1,18 @@ +FROM fedora:41 +RUN dnf -y upgrade +RUN dnf -y install \ + gcc \ + make \ + flex \ + bison \ + autoconf \ + libssh-devel \ + ncurses-devel \ + readline-devel +RUN dnf -y install \ + git \ + rpm-build \ + systemd-rpm-macros \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/docker/ubuntu-21.04-amd64/Dockerfile b/misc/docker/ubuntu-22.04-amd64/Dockerfile similarity index 82% rename from misc/docker/ubuntu-21.04-amd64/Dockerfile rename to misc/docker/ubuntu-22.04-amd64/Dockerfile index 1c32727b1..00c4ffec4 100644 --- a/misc/docker/ubuntu-21.04-amd64/Dockerfile +++ b/misc/docker/ubuntu-22.04-amd64/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:21.04 +# bump this to refresh the image: 1 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN apt-get -y update RUN apt-get -y upgrade RUN apt-get -y install \ diff --git a/misc/docker/ubuntu-24.04-amd64/Dockerfile b/misc/docker/ubuntu-24.04-amd64/Dockerfile new file mode 100644 index 000000000..b6567eb25 --- /dev/null +++ b/misc/docker/ubuntu-24.04-amd64/Dockerfile @@ -0,0 +1,27 @@ +# bump this to refresh the image: 1 +FROM ubuntu:24.04 +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get -y update +RUN apt-get -y upgrade +RUN apt-get -y install \ + build-essential \ + flex \ + bison \ + autoconf \ + ncurses-dev \ + libreadline-dev \ + libssh-gcrypt-dev \ + linuxdoc-tools-latex \ + texlive-latex-extra \ + opensp \ + docbook-xsl \ + xsltproc +RUN apt-get -y install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools diff --git a/misc/docker/ubuntu-24.10-amd64/Dockerfile b/misc/docker/ubuntu-24.10-amd64/Dockerfile new file mode 100644 index 000000000..b886ec638 --- /dev/null +++ b/misc/docker/ubuntu-24.10-amd64/Dockerfile @@ -0,0 +1,27 @@ +# bump this to refresh the image: 1 +FROM ubuntu:24.10 +ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get -y update +RUN apt-get -y upgrade +RUN apt-get -y install \ + build-essential \ + flex \ + bison \ + autoconf \ + ncurses-dev \ + libreadline-dev \ + libssh-gcrypt-dev \ + linuxdoc-tools-latex \ + texlive-latex-extra \ + opensp \ + docbook-xsl \ + xsltproc +RUN apt-get -y install \ + git \ + dpkg-dev \ + debhelper \ + apt-utils \ + quilt \ + python3 \ + python3-pip \ + python3-setuptools -- 2.47.2