From 006fcd7a3898c748539969b05e3cad1356b51fb5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 20 Apr 2021 12:32:31 +0200
Subject: [PATCH] Add Ubuntu Hirsute
---
.gitlab-ci.yml | 3 +++
Makefile | 2 +-
hirsute/Makefile | 1 +
hirsute/x86_64/Dockerfile | 26 ++++++++++++++++++++++++++
hirsute/x86_64/Makefile | 1 +
5 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 hirsute/Makefile
create mode 100644 hirsute/x86_64/Dockerfile
create mode 100644 hirsute/x86_64/Makefile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df7203d..38ab0a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,9 @@ before_script:
- make -C ${CI_JOB_NAME}
- '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push'
+hirsute:
+ <<: *build_job
+
groovy:
<<: *build_job
diff --git a/Makefile b/Makefile
index 3d33a5a..584b7cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS := trusty xenial bionic disco focal
+TARGETS := trusty xenial bionic disco focal hirsute
TARGETS_PUSH := $(TARGETS:=-push)
TARGETS_CLEAN := $(TARGETS:=-clean)
diff --git a/hirsute/Makefile b/hirsute/Makefile
new file mode 100644
index 0000000..5a52fcc
--- /dev/null
+++ b/hirsute/Makefile
@@ -0,0 +1 @@
+include ../dist_x86_64.mk
diff --git a/hirsute/x86_64/Dockerfile b/hirsute/x86_64/Dockerfile
new file mode 100644
index 0000000..a9993a7
--- /dev/null
+++ b/hirsute/x86_64/Dockerfile
@@ -0,0 +1,26 @@
+FROM ubuntu:hirsute
+
+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/hirsute/x86_64/Makefile b/hirsute/x86_64/Makefile
new file mode 100644
index 0000000..15497f2
--- /dev/null
+++ b/hirsute/x86_64/Makefile
@@ -0,0 +1 @@
+include ../../image.mk
--
GitLab