From 40f3a72b840c5c516a05abbc67f68b81e1129f5a Mon Sep 17 00:00:00 2001
From: Bernhard Heinloth <heinloth@cs.fau.de>
Date: Wed, 3 May 2023 12:30:57 +0200
Subject: [PATCH] migrate to inf4

---
 Makefile                   |  2 +-
 README.md                  | 22 ++++++++++++++++++++++
 almalinux-9/Dockerfile     | 10 ++++++----
 debian-bookworm/Dockerfile | 10 ++++++----
 debian-bullseye/Dockerfile | 10 ++++++----
 debian-buster/Dockerfile   | 10 ++++++----
 debian-stretch/Dockerfile  | 10 ++++++----
 fedora-36/Dockerfile       | 10 ++++++----
 fedora-37/Dockerfile       | 10 ++++++----
 opensuseleap-15/Dockerfile | 10 ++++++----
 oraclelinux-9/Dockerfile   | 10 ++++++----
 rhel-9/Dockerfile          | 10 ++++++----
 ubuntu-focal/Dockerfile    | 11 +++++++----
 ubuntu-jammy/Dockerfile    | 10 ++++++----
 14 files changed, 96 insertions(+), 49 deletions(-)
 create mode 100644 README.md

diff --git a/Makefile b/Makefile
index 189277e..31b59c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-REPO=heinloth/lp-build
+REPO=inf4/luci
 DOCKERFILES=$(sort $(wildcard */Dockerfile))
 TAGS=$(patsubst %/Dockerfile,%,$(DOCKERFILES))
 PUSHTAGS=$(addprefix push-,$(TAGS))
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..983c701
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+Luci build & test environment
+=============================
+
+Dockerfiles to create images of different distributions preinstalled with all required components to build and test Luci.
+
+They are located at
+
+    https://hub.docker.com/repository/docker/inf4/luci/general
+
+and are used to speed up the GitLab CI.
+
+
+Create Docker Images
+--------------------
+
+Run
+
+    docker login
+    make
+
+to create and push all images to Docker hub
+
diff --git a/almalinux-9/Dockerfile b/almalinux-9/Dockerfile
index 0d845ed..4a2f6c1 100644
--- a/almalinux-9/Dockerfile
+++ b/almalinux-9/Dockerfile
@@ -1,11 +1,13 @@
 FROM almalinux:9
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/almalinux-9"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/debian-bookworm/Dockerfile b/debian-bookworm/Dockerfile
index e3d3592..9459c6c 100644
--- a/debian-bookworm/Dockerfile
+++ b/debian-bookworm/Dockerfile
@@ -1,14 +1,16 @@
 FROM debian:bookworm
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-bookworm"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin make nano rustc
diff --git a/debian-bullseye/Dockerfile b/debian-bullseye/Dockerfile
index b5f4079..1af2d2c 100644
--- a/debian-bullseye/Dockerfile
+++ b/debian-bullseye/Dockerfile
@@ -1,14 +1,16 @@
 FROM debian:bullseye
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-bullseye"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin make nano rustc
diff --git a/debian-buster/Dockerfile b/debian-buster/Dockerfile
index ecf31ce..61a44a6 100644
--- a/debian-buster/Dockerfile
+++ b/debian-buster/Dockerfile
@@ -1,14 +1,16 @@
 FROM debian:buster
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-buster"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin make nano rustc
diff --git a/debian-stretch/Dockerfile b/debian-stretch/Dockerfile
index b5a1555..890ae66 100644
--- a/debian-stretch/Dockerfile
+++ b/debian-stretch/Dockerfile
@@ -1,17 +1,19 @@
 FROM debian:stretch
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/debian-stretch"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && sed -i -e '/stretch-updates/d' -e 's/\(security\|deb\).debian.org/archive.debian.org/' /etc/apt/sources.list \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang-11 gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin \
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang-11 gcc gccgo git g++ file fpc gfortran gnat golang less libcap2-bin make nano rustc \
  && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 110 --slave /usr/bin/clang++ clang++ /usr/bin/clang++-11
 
diff --git a/fedora-36/Dockerfile b/fedora-36/Dockerfile
index 520889b..975c3c4 100644
--- a/fedora-36/Dockerfile
+++ b/fedora-36/Dockerfile
@@ -1,11 +1,13 @@
 FROM fedora:36
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/fedora-36"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/fedora-37/Dockerfile b/fedora-37/Dockerfile
index 4e29077..7cb73a1 100644
--- a/fedora-37/Dockerfile
+++ b/fedora-37/Dockerfile
@@ -1,11 +1,13 @@
 FROM fedora:37
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/fedora-37"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/opensuseleap-15/Dockerfile b/opensuseleap-15/Dockerfile
index bda1a67..1ac26c5 100644
--- a/opensuseleap-15/Dockerfile
+++ b/opensuseleap-15/Dockerfile
@@ -1,11 +1,13 @@
 FROM opensuse/leap:15
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/opensuseleap-15"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN zypper install -y nano less file make libcap-progs gcc gcc-c++ clang
+RUN zypper install -y clang gcc gcc-c++ file less libcap-progs make nano
diff --git a/oraclelinux-9/Dockerfile b/oraclelinux-9/Dockerfile
index 1485bba..3c0447a 100644
--- a/oraclelinux-9/Dockerfile
+++ b/oraclelinux-9/Dockerfile
@@ -1,11 +1,13 @@
 FROM oraclelinux:9
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/oraclelinux-9"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/rhel-9/Dockerfile b/rhel-9/Dockerfile
index 8e0fdb4..9c8b656 100644
--- a/rhel-9/Dockerfile
+++ b/rhel-9/Dockerfile
@@ -1,11 +1,13 @@
 FROM redhat/ubi9
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/rhel-9"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
-RUN yum install -y nano less file make diffutils gcc gcc-c++ clang
+RUN yum install -y clang diffutils gcc gcc-c++ file less make nano
diff --git a/ubuntu-focal/Dockerfile b/ubuntu-focal/Dockerfile
index 3a39240..153c126 100644
--- a/ubuntu-focal/Dockerfile
+++ b/ubuntu-focal/Dockerfile
@@ -1,14 +1,17 @@
 FROM ubuntu:focal
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/ubuntu-focal"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
+
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin libstdc++-10-dev
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin libstdc++-10-dev make nano rustc
diff --git a/ubuntu-jammy/Dockerfile b/ubuntu-jammy/Dockerfile
index 4052fa7..50e5fe1 100644
--- a/ubuntu-jammy/Dockerfile
+++ b/ubuntu-jammy/Dockerfile
@@ -1,14 +1,16 @@
 FROM ubuntu:jammy
 
-LABEL maintainer="heinloth@cs.fau.de"
-
 ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C.UTF-8
 
+LABEL maintainer="heinloth@cs.fau.de"
 LABEL org.label-schema.schema-version="1.0"
-LABEL org.label-schema.name="lp-build/ubuntu-jammy"
+LABEL org.label-schema.name="inf4/luci"
+LABEL org.label-schema.description="Luci build & test environment"
 LABEL org.label-schema.vendor="Friedrich-Alexander-Universität Erlangen-Nürnberg / Lehrstuhl für Informatik 4"
+LABEL org.label-schema.url="https://gitlab.cs.fau.de/luci-project"
+LABEL org.label-schema.vcs-url="https://gitlab.cs.fau.de/luci-project/docker"
 
 RUN  ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime \
  && apt-get update \
- && apt-get install -y apt-transport-https ca-certificates build-essential file less nano clang gcc gccgo g++ gfortran gnat golang fpc rustc make libcap2-bin
+ && apt-get install -y apt-transport-https ca-certificates build-essential clang cpplint file fpc gcc gccgo git g++ gfortran gnat golang less libcap2-bin libc++-dev make nano python3 python3-pyparsing rustc
-- 
GitLab