From 05f64edd2413c522f8e31ded655998db3db5e183 Mon Sep 17 00:00:00 2001 From: Henrik Triem <henrik.triem@netways.de> Date: Mon, 4 May 2020 14:21:48 +0200 Subject: [PATCH] Add support for Focal Fossa (Ubuntu 20.04 LTS) --- focal/Makefile | 1 + focal/x86/Dockerfile | 26 ++++++++++++++++++++++++++ focal/x86/Makefile | 1 + focal/x86_64/Dockerfile | 26 ++++++++++++++++++++++++++ focal/x86_64/Makefile | 1 + 5 files changed, 55 insertions(+) create mode 100644 focal/Makefile create mode 100644 focal/x86/Dockerfile create mode 100644 focal/x86/Makefile create mode 100644 focal/x86_64/Dockerfile create mode 100644 focal/x86_64/Makefile diff --git a/focal/Makefile b/focal/Makefile new file mode 100644 index 0000000..5575b72 --- /dev/null +++ b/focal/Makefile @@ -0,0 +1 @@ +include ../dist.mk diff --git a/focal/x86/Dockerfile b/focal/x86/Dockerfile new file mode 100644 index 0000000..7a1e7d6 --- /dev/null +++ b/focal/x86/Dockerfile @@ -0,0 +1,26 @@ +FROM i386/ubuntu:focal + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y eatmydata \ + && eatmydata apt-get upgrade -y + +RUN eatmydata apt-get install -y \ + sudo wget curl tar expect git \ + devscripts build-essential lintian ccache pbuilder aptitude apt-utils + +RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ + && DIST="$(lsb_release -sc)" \ + && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN groupadd -g 1000 build \ + && useradd -u 1000 -g 1000 -m build \ + && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \ + && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \ + && chown build.build /usr/local/bin + +USER build +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/focal/x86/Makefile b/focal/x86/Makefile new file mode 100644 index 0000000..15497f2 --- /dev/null +++ b/focal/x86/Makefile @@ -0,0 +1 @@ +include ../../image.mk diff --git a/focal/x86_64/Dockerfile b/focal/x86_64/Dockerfile new file mode 100644 index 0000000..433d1c6 --- /dev/null +++ b/focal/x86_64/Dockerfile @@ -0,0 +1,26 @@ +FROM ubuntu:focal + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y eatmydata \ + && eatmydata apt-get upgrade -y + +RUN eatmydata apt-get install -y \ + sudo wget curl tar expect git \ + devscripts build-essential lintian ccache pbuilder aptitude apt-utils + +RUN curl https://packages.icinga.com/icinga.key | apt-key add - \ + && DIST="$(lsb_release -sc)" \ + && echo "deb http://packages.icinga.com/ubuntu icinga-${DIST} main" > /etc/apt/sources.list.d/${DIST}-icinga.list + +RUN groupadd -g 1000 build \ + && useradd -u 1000 -g 1000 -m build \ + && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \ + && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \ + && chown build.build /usr/local/bin + +USER build +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/focal/x86_64/Makefile b/focal/x86_64/Makefile new file mode 100644 index 0000000..15497f2 --- /dev/null +++ b/focal/x86_64/Makefile @@ -0,0 +1 @@ +include ../../image.mk -- GitLab