From 9e6f350efb86879594ee6fb40170cce817c9e0bf Mon Sep 17 00:00:00 2001 From: Matous Holinka Date: Wed, 20 Nov 2019 09:24:13 +0100 Subject: [PATCH] bird: debian 7 primary repository has been changed --- .gitlab-ci.yml | 351 ++++++++++----------- misc/docker/debian-7-i386/Dockerfile | 2 +- misc/docker/opensuse-42.3-amd64/Dockerfile | 11 - 3 files changed, 172 insertions(+), 192 deletions(-) delete mode 100644 misc/docker/opensuse-42.3-amd64/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32abe2f6..4c6a5876 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,135 +36,130 @@ docker_debian-7-amd64: IMG_NAME: "debian-7-amd64" <<: *docker_build -docker_debian-8-amd64: - variables: - IMG_NAME: "debian-8-amd64" - <<: *docker_build +# docker_debian-8-amd64: +# variables: +# IMG_NAME: "debian-8-amd64" +# <<: *docker_build -docker_debian-9-amd64: - variables: - IMG_NAME: "debian-9-amd64" - <<: *docker_build +# docker_debian-9-amd64: +# variables: +# IMG_NAME: "debian-9-amd64" +# <<: *docker_build -docker_debian-10-amd64: - variables: - IMG_NAME: "debian-10-amd64" - <<: *docker_build +# docker_debian-10-amd64: +# variables: +# IMG_NAME: "debian-10-amd64" +# <<: *docker_build -docker_debian-testing-amd64: - variables: - IMG_NAME: "debian-testing-amd64" - <<: *docker_build +# docker_debian-testing-amd64: +# variables: +# IMG_NAME: "debian-testing-amd64" +# <<: *docker_build docker_debian-7-i386: variables: IMG_NAME: "debian-7-i386" <<: *docker_build -docker_debian-8-i386: - variables: - IMG_NAME: "debian-8-i386" - <<: *docker_build +# docker_debian-8-i386: +# variables: +# IMG_NAME: "debian-8-i386" +# <<: *docker_build -docker_debian-9-i386: - variables: - IMG_NAME: "debian-9-i386" - <<: *docker_build +# docker_debian-9-i386: +# variables: +# IMG_NAME: "debian-9-i386" +# <<: *docker_build -docker_debian-10-i386: - variables: - IMG_NAME: "debian-10-i386" - <<: *docker_build +# docker_debian-10-i386: +# variables: +# IMG_NAME: "debian-10-i386" +# <<: *docker_build -docker_debian-testing-i386: - variables: - IMG_NAME: "debian-testing-i386" - <<: *docker_build +# docker_debian-testing-i386: +# variables: +# IMG_NAME: "debian-testing-i386" +# <<: *docker_build -docker_fedora-25-amd64: - variables: - IMG_NAME: "fedora-25-amd64" - <<: *docker_build +# docker_fedora-25-amd64: +# variables: +# IMG_NAME: "fedora-25-amd64" +# <<: *docker_build -docker_fedora-26-amd64: - variables: - IMG_NAME: "fedora-26-amd64" - <<: *docker_build +# docker_fedora-26-amd64: +# variables: +# IMG_NAME: "fedora-26-amd64" +# <<: *docker_build -docker_fedora-27-amd64: - variables: - IMG_NAME: "fedora-27-amd64" - <<: *docker_build +# docker_fedora-27-amd64: +# variables: +# IMG_NAME: "fedora-27-amd64" +# <<: *docker_build -docker_fedora-28-amd64: - variables: - IMG_NAME: "fedora-28-amd64" - <<: *docker_build +# docker_fedora-28-amd64: +# variables: +# IMG_NAME: "fedora-28-amd64" +# <<: *docker_build -docker_fedora-29-amd64: - variables: - IMG_NAME: "fedora-29-amd64" - <<: *docker_build +# docker_fedora-29-amd64: +# variables: +# IMG_NAME: "fedora-29-amd64" +# <<: *docker_build -docker_fedora-30-amd64: - variables: - IMG_NAME: "fedora-30-amd64" - <<: *docker_build +# docker_fedora-30-amd64: +# variables: +# IMG_NAME: "fedora-30-amd64" +# <<: *docker_build -docker_fedora-31-amd64: - variables: - IMG_NAME: "fedora-31-amd64" - <<: *docker_build +# docker_fedora-31-amd64: +# variables: +# IMG_NAME: "fedora-31-amd64" +# <<: *docker_build -docker_centos-7-amd64: - variables: - IMG_NAME: "centos-7-amd64" - <<: *docker_build +# docker_centos-7-amd64: +# variables: +# IMG_NAME: "centos-7-amd64" +# <<: *docker_build -docker_centos-8-amd64: - variables: - IMG_NAME: "centos-8-amd64" - <<: *docker_build +# docker_centos-8-amd64: +# variables: +# IMG_NAME: "centos-8-amd64" +# <<: *docker_build -docker_opensuse-42_3-amd64: - variables: - IMG_NAME: "opensuse-42.3-amd64" - <<: *docker_build - -docker_ubuntu-14_04-amd64: - variables: - IMG_NAME: "ubuntu-14.04-amd64" - <<: *docker_build +# docker_ubuntu-14_04-amd64: +# variables: +# IMG_NAME: "ubuntu-14.04-amd64" +# <<: *docker_build -docker_ubuntu-16_04-amd64: - variables: - IMG_NAME: "ubuntu-16.04-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-18_04-amd64: +# variables: +# IMG_NAME: "ubuntu-18.04-amd64" +# <<: *docker_build -docker_ubuntu-19_04-amd64: - variables: - IMG_NAME: "ubuntu-19.04-amd64" - <<: *docker_build +# docker_ubuntu-19_04-amd64: +# variables: +# IMG_NAME: "ubuntu-19.04-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 - tags: - - freebsd - - i386 - #only: - #- master - #- triggers - #- tags +# # 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 +# tags: +# - freebsd +# - i386 +# #only: +# #- master +# #- triggers +# #- tags -.freebsd-11-amd64: &freebsd-11-amd64_env - tags: - - freebsd - - amd64 +# .freebsd-11-amd64: &freebsd-11-amd64_env +# tags: +# - freebsd +# - amd64 .build: &build-base stage: build @@ -202,106 +197,102 @@ build-debian-7-i386: <<: *build-linux image: registry.labs.nic.cz/labs/bird:debian-7-i386 -build-debian-8-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-8-amd64 +# build-debian-8-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-8-amd64 -build-debian-8-i386: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-8-i386 +# build-debian-8-i386: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-8-i386 -build-debian-9-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-9-amd64 +# build-debian-9-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-9-amd64 -build-debian-9-i386: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-9-i386 +# build-debian-9-i386: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-9-i386 -build-debian-10-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-10-amd64 +# build-debian-10-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-10-amd64 -build-debian-10-i386: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-10-i386 +# build-debian-10-i386: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-10-i386 -build-debian-testing-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 +# build-debian-testing-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-testing-amd64 -build-debian-testing-i386: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:debian-testing-i386 +# build-debian-testing-i386: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:debian-testing-i386 -build-fedora-25-amd64: - <<: [*preprocessing-fedora, *build-linux] - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:fedora-25-amd64 +# build-fedora-25-amd64: +# <<: [*preprocessing-fedora, *build-linux] +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:fedora-25-amd64 -build-fedora-26-amd64: - <<: [*preprocessing-fedora, *build-linux] - image: registry.labs.nic.cz/labs/bird:fedora-26-amd64 +# build-fedora-26-amd64: +# <<: [*preprocessing-fedora, *build-linux] +# image: registry.labs.nic.cz/labs/bird:fedora-26-amd64 -build-fedora-27-amd64: - <<: [*preprocessing-fedora, *build-linux] - image: registry.labs.nic.cz/labs/bird:fedora-27-amd64 +# build-fedora-27-amd64: +# <<: [*preprocessing-fedora, *build-linux] +# image: registry.labs.nic.cz/labs/bird:fedora-27-amd64 -build-fedora-28-amd64: - <<: [*preprocessing-fedora, *build-linux] - image: registry.labs.nic.cz/labs/bird:fedora-28-amd64 +# build-fedora-28-amd64: +# <<: [*preprocessing-fedora, *build-linux] +# image: registry.labs.nic.cz/labs/bird:fedora-28-amd64 -build-fedora-29-amd64: - <<: [*preprocessing-fedora, *build-linux] - image: registry.labs.nic.cz/labs/bird:fedora-29-amd64 +# build-fedora-29-amd64: +# <<: [*preprocessing-fedora, *build-linux] +# image: registry.labs.nic.cz/labs/bird:fedora-29-amd64 -build-fedora-30-amd64: - <<: [*preprocessing-fedora, *build-linux] - image: registry.labs.nic.cz/labs/bird:fedora-30-amd64 +# build-fedora-30-amd64: +# <<: [*preprocessing-fedora, *build-linux] +# image: registry.labs.nic.cz/labs/bird:fedora-30-amd64 -build-fedora-31-amd64: - <<: [*preprocessing-fedora, *build-linux] - image: registry.labs.nic.cz/labs/bird:fedora-31-amd64 +# build-fedora-31-amd64: +# <<: [*preprocessing-fedora, *build-linux] +# image: registry.labs.nic.cz/labs/bird:fedora-31-amd64 -build-centos-7-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:centos-7-amd64 +# build-centos-7-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:centos-7-amd64 -build-centos-8-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:centos-8-amd64 +# build-centos-8-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:centos-8-amd64 -build-opensuse-42_3-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:opensuse-42.3-amd64 +# build-ubuntu-14_04-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64 -build-ubuntu-14_04-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:ubuntu-14.04-amd64 +# build-ubuntu-16_04-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64 -build-ubuntu-16_04-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:ubuntu-16.04-amd64 +# build-ubuntu-18_04-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64 -build-ubuntu-18_04-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:ubuntu-18.04-amd64 +# build-ubuntu-19_04-amd64: +# <<: *build-linux +# image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64 -build-ubuntu-19_04-amd64: - <<: *build-linux - image: registry.labs.nic.cz/labs/bird:ubuntu-19.04-amd64 +# build-freebsd-11-amd64: +# <<: *build-base +# tags: +# - freebsd +# - amd64 -build-freebsd-11-amd64: - <<: *build-base - tags: - - freebsd - - amd64 - -build-freebsd-11-i386: - <<: *build-base - tags: - - freebsd - - i386 +# build-freebsd-11-i386: +# <<: *build-base +# tags: +# - freebsd +# - i386 build-birdlab: stage: build diff --git a/misc/docker/debian-7-i386/Dockerfile b/misc/docker/debian-7-i386/Dockerfile index 753ff1cb..45090129 100644 --- a/misc/docker/debian-7-i386/Dockerfile +++ b/misc/docker/debian-7-i386/Dockerfile @@ -1,6 +1,6 @@ FROM i386/debian:wheezy-slim ENV DEBIAN_FRONTEND noninteractive -RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list +RUN sed -i 'http://archive.debian.org/debian/' /etc/apt/sources.list RUN apt-get -y update RUN apt-get -y upgrade RUN apt-get -y install \ diff --git a/misc/docker/opensuse-42.3-amd64/Dockerfile b/misc/docker/opensuse-42.3-amd64/Dockerfile deleted file mode 100644 index c9f7127d..00000000 --- a/misc/docker/opensuse-42.3-amd64/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM opensuse:42.3 -RUN zypper -n up -RUN zypper -n install \ - autoconf \ - flex \ - bison \ - pkgconfig \ - readline-devel \ - ncurses-devel \ - gcc \ - gmake