From b646c0098120bbb10ec91fa2fbf1df416c5849bd Mon Sep 17 00:00:00 2001 From: Matous Date: Wed, 21 Apr 2021 13:22:23 +0200 Subject: [PATCH] CI/CD: some latest releases added. /misc/docker/: + debian 11 (i386+amd64) added, + fedora 32 added, + fedora 33 added, + fedora 34 added, + opensuse 15.2 added, + opensuse 15.3 added, + ubuntu 20.04 added, + ubuntu 20.10 added, + ubuntu 21.04 added, - ubuntu 19.10 removed. /.gitlab-ci.yml: + stages 'image' and 'build' updated. --- .gitlab-ci.yml | 89 ++++++++++++++++++- misc/docker/debian-11-amd64/Dockerfile | 13 +++ .../Dockerfile | 9 +- misc/docker/fedora-32-amd64/Dockerfile | 13 +++ misc/docker/fedora-33-amd64/Dockerfile | 13 +++ misc/docker/fedora-34-amd64/Dockerfile | 13 +++ misc/docker/opensuse-15.2-amd64/Dockerfile | 12 +++ misc/docker/opensuse-15.3-amd64/Dockerfile | 12 +++ misc/docker/ubuntu-20.04-amd64/Dockerfile | 14 +++ misc/docker/ubuntu-20.10-amd64/Dockerfile | 14 +++ misc/docker/ubuntu-21.04-amd64/Dockerfile | 14 +++ 11 files changed, 208 insertions(+), 8 deletions(-) create mode 100644 misc/docker/debian-11-amd64/Dockerfile rename misc/docker/{ubuntu-19.10-amd64 => debian-11-i386}/Dockerfile (61%) create mode 100644 misc/docker/fedora-32-amd64/Dockerfile create mode 100644 misc/docker/fedora-33-amd64/Dockerfile create mode 100644 misc/docker/fedora-34-amd64/Dockerfile create mode 100644 misc/docker/opensuse-15.2-amd64/Dockerfile create mode 100644 misc/docker/opensuse-15.3-amd64/Dockerfile create mode 100644 misc/docker/ubuntu-20.04-amd64/Dockerfile create mode 100644 misc/docker/ubuntu-20.10-amd64/Dockerfile create mode 100644 misc/docker/ubuntu-21.04-amd64/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b630510b..a005ddcf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,16 @@ docker_debian-10-i386: 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-testing-amd64: variables: IMG_NAME: "debian-testing-amd64" @@ -106,6 +116,21 @@ docker_fedora-31-amd64: IMG_NAME: "fedora-31-amd64" <<: *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_centos-7-amd64: variables: IMG_NAME: "centos-7-amd64" @@ -131,9 +156,19 @@ docker_ubuntu-18_04-amd64: IMG_NAME: "ubuntu-18.04-amd64" <<: *docker_build -docker_ubuntu-19_10-amd64: +docker_ubuntu-20_04-amd64: variables: - IMG_NAME: "ubuntu-19.10-amd64" + IMG_NAME: "ubuntu-20.04-amd64" + <<: *docker_build + +docker_ubuntu-20_10-amd64: + variables: + IMG_NAME: "ubuntu-20.10-amd64" + <<: *docker_build + +docker_ubuntu-21_04-amd64: + variables: + IMG_NAME: "ubuntu-21.04-amd64" <<: *docker_build docker_opensuse-15.0-amd64: @@ -146,6 +181,16 @@ docker_opensuse-15.1-amd64: 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 + # TODO We want to copy these BSDs to our own virtual machines, to make sure # someone doesn't update them by accident. .freebsd-11-i386: &freebsd-11-i386_env @@ -205,6 +250,14 @@ build-debian-10-i386: <<: *build-linux image: registry.labs.nic.cz/labs/bird:debian-10-i386 +build-debian-11-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-11-amd64 + +build-debian-11-i386: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:debian-11-i386 + build-debian-testing-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 @@ -241,6 +294,18 @@ build-fedora-31-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:fedora-31-amd64 +build-fedora-32-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:fedora-32-amd64 + +build-fedora-33-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:fedora-33-amd64 + +build-fedora-34-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:fedora-33-amd64 + build-centos-7-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:centos-7-amd64 @@ -261,9 +326,17 @@ build-ubuntu-18_04-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64 -build-ubuntu-19_04-amd64: +build-ubuntu-20_04-amd64: <<: *build-linux - image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64 + image: registry.labs.nic.cz/labs/bird:ubuntu-20.04-amd64 + +build-ubuntu-20_10-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:ubuntu-20.10-amd64 + +build-ubuntu-21_04-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:ubuntu-21.04-amd64 build-opensuse-15.0-amd64: <<: *build-linux @@ -273,6 +346,14 @@ build-opensuse-15.1-amd64: <<: *build-linux image: registry.labs.nic.cz/labs/bird:opensuse-15.1-amd64 +build-opensuse-15.2-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:opensuse-15.2-amd64 + +build-opensuse-15.3-amd64: + <<: *build-linux + image: registry.labs.nic.cz/labs/bird:opensuse-15.3-amd64 + build-freebsd-11-amd64: <<: *build-base tags: diff --git a/misc/docker/debian-11-amd64/Dockerfile b/misc/docker/debian-11-amd64/Dockerfile new file mode 100644 index 00000000..803f3243 --- /dev/null +++ b/misc/docker/debian-11-amd64/Dockerfile @@ -0,0 +1,13 @@ +FROM amd64/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 install \ + autoconf \ + build-essential \ + flex \ + bison \ + ncurses-dev \ + libreadline-dev + diff --git a/misc/docker/ubuntu-19.10-amd64/Dockerfile b/misc/docker/debian-11-i386/Dockerfile similarity index 61% rename from misc/docker/ubuntu-19.10-amd64/Dockerfile rename to misc/docker/debian-11-i386/Dockerfile index 8119e439..d599dbfc 100644 --- a/misc/docker/ubuntu-19.10-amd64/Dockerfile +++ b/misc/docker/debian-11-i386/Dockerfile @@ -1,8 +1,8 @@ -FROM ubuntu:19.10 -ENV DEBIAN_FRONTEND noninteractive +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 -RUN apt-get -y upgrade +RUN apt-get -y update && apt-get -y upgrade RUN apt-get -y install \ autoconf \ build-essential \ @@ -10,3 +10,4 @@ RUN apt-get -y install \ bison \ ncurses-dev \ libreadline-dev + diff --git a/misc/docker/fedora-32-amd64/Dockerfile b/misc/docker/fedora-32-amd64/Dockerfile new file mode 100644 index 00000000..6c8d6dac --- /dev/null +++ b/misc/docker/fedora-32-amd64/Dockerfile @@ -0,0 +1,13 @@ +FROM fedora:32 + +RUN dnf -y update && dnf -y upgrade +RUN dnf -y install \ + make \ + autoconf \ + flex \ + bison \ + pkgconfig \ + "readline-devel" \ + "pkgconfig(ncurses)" \ + gcc + diff --git a/misc/docker/fedora-33-amd64/Dockerfile b/misc/docker/fedora-33-amd64/Dockerfile new file mode 100644 index 00000000..5551fe53 --- /dev/null +++ b/misc/docker/fedora-33-amd64/Dockerfile @@ -0,0 +1,13 @@ +FROM fedora:33 + +RUN dnf -y update && dnf -y upgrade +RUN dnf -y install \ + make \ + autoconf \ + flex \ + bison \ + pkgconfig \ + "readline-devel" \ + "pkgconfig(ncurses)" \ + gcc + diff --git a/misc/docker/fedora-34-amd64/Dockerfile b/misc/docker/fedora-34-amd64/Dockerfile new file mode 100644 index 00000000..ef78db2d --- /dev/null +++ b/misc/docker/fedora-34-amd64/Dockerfile @@ -0,0 +1,13 @@ +FROM fedora:34 + +RUN dnf -y update && dnf -y upgrade +RUN dnf -y install \ + make \ + autoconf \ + flex \ + bison \ + pkgconfig \ + "readline-devel" \ + "pkgconfig(ncurses)" \ + gcc + diff --git a/misc/docker/opensuse-15.2-amd64/Dockerfile b/misc/docker/opensuse-15.2-amd64/Dockerfile new file mode 100644 index 00000000..d1acd5c4 --- /dev/null +++ b/misc/docker/opensuse-15.2-amd64/Dockerfile @@ -0,0 +1,12 @@ +FROM opensuse/leap:15.2 + +RUN zypper -n up +RUN zypper -n install \ + autoconf \ + flex \ + bison \ + pkgconfig \ + readline-devel \ + ncurses-devel \ + gcc \ + gmake diff --git a/misc/docker/opensuse-15.3-amd64/Dockerfile b/misc/docker/opensuse-15.3-amd64/Dockerfile new file mode 100644 index 00000000..4515e3be --- /dev/null +++ b/misc/docker/opensuse-15.3-amd64/Dockerfile @@ -0,0 +1,12 @@ +FROM opensuse/leap:15.3 + +RUN zypper -n up +RUN zypper -n install \ + autoconf \ + flex \ + bison \ + pkgconfig \ + readline-devel \ + ncurses-devel \ + gcc \ + gmake diff --git a/misc/docker/ubuntu-20.04-amd64/Dockerfile b/misc/docker/ubuntu-20.04-amd64/Dockerfile new file mode 100644 index 00000000..4b773697 --- /dev/null +++ b/misc/docker/ubuntu-20.04-amd64/Dockerfile @@ -0,0 +1,14 @@ +FROM ubuntu:20.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 \ + autoconf \ + build-essential \ + flex \ + bison \ + ncurses-dev \ + libreadline-dev \ + diff --git a/misc/docker/ubuntu-20.10-amd64/Dockerfile b/misc/docker/ubuntu-20.10-amd64/Dockerfile new file mode 100644 index 00000000..0c135280 --- /dev/null +++ b/misc/docker/ubuntu-20.10-amd64/Dockerfile @@ -0,0 +1,14 @@ +FROM ubuntu:20.10 + +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 \ + autoconf \ + build-essential \ + flex \ + bison \ + ncurses-dev \ + libreadline-dev \ + diff --git a/misc/docker/ubuntu-21.04-amd64/Dockerfile b/misc/docker/ubuntu-21.04-amd64/Dockerfile new file mode 100644 index 00000000..64dc2f33 --- /dev/null +++ b/misc/docker/ubuntu-21.04-amd64/Dockerfile @@ -0,0 +1,14 @@ +FROM ubuntu:21.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 \ + autoconf \ + build-essential \ + flex \ + bison \ + ncurses-dev \ + libreadline-dev +