]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
bird: debian 7 primary repository has been changed
authorMatous Holinka <matous.holinka@nic.cz>
Wed, 20 Nov 2019 08:24:13 +0000 (09:24 +0100)
committerMatous Holinka <matous.holinka@nic.cz>
Wed, 20 Nov 2019 08:24:13 +0000 (09:24 +0100)
.gitlab-ci.yml
misc/docker/debian-7-i386/Dockerfile
misc/docker/opensuse-42.3-amd64/Dockerfile [deleted file]

index 32abe2f6ef5495fe00eaa9fdb77ff6edb512b635..4c6a58762d5b27b451685b9481944bb68d808970 100644 (file)
@@ -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-9-amd64:
-  variables:
-    IMG_NAME: "debian-9-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-8-amd64:
+  variables:
+    IMG_NAME: "debian-8-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-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-9-i386:
-  variables:
-    IMG_NAME: "debian-9-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_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-27-amd64:
-  variables:
-    IMG_NAME: "fedora-27-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-30-amd64:
-  variables:
-    IMG_NAME: "fedora-30-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-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_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-10-i386:
+#   variables:
+#     IMG_NAME: "debian-10-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-26-amd64:
+#   variables:
+#     IMG_NAME: "fedora-26-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-29-amd64:
+#   variables:
+#     IMG_NAME: "fedora-29-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_centos-7-amd64:
+#   variables:
+#     IMG_NAME: "centos-7-amd64"
+#   <<: *docker_build
+
+# docker_centos-8-amd64:
+#   variables:
+#     IMG_NAME: "centos-8-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
-
-# 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
+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
+
+.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-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-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-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-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-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-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-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-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-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-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-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-i386:
-  <<: *build-base
-  tags:
-    - freebsd
-    - i386
+# 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-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-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-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-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-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-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-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-8-amd64:
+#   <<: *build-linux
+#   image: registry.labs.nic.cz/labs/bird:centos-8-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-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-freebsd-11-amd64:
+#   <<: *build-base
+#   tags:
+#     - freebsd
+#     - amd64
+
+# build-freebsd-11-i386:
+#   <<: *build-base
+#   tags:
+#     - freebsd
+#     - i386
 
 build-birdlab:
   stage: build
index 753ff1cb01ad7a737f4c9009f6a6ce3cc96d2766..4509012927572a2d947fe704fb02254f067f231a 100644 (file)
@@ -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 (file)
index c9f7127..0000000
+++ /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