From 8dea0d4ebabe613d4bccaa81eddcd8e1bc7e3294 Mon Sep 17 00:00:00 2001 From: Henrik Triem <henrik.triem@icinga.com> Date: Mon, 9 Jan 2023 01:54:12 +0000 Subject: [PATCH] Add kinetic for building redis --- .gitlab-ci.yml | 14 +------------- Makefile | 2 +- kinetic/Makefile | 1 + kinetic/x86_64/Dockerfile | 27 +++++++++++++++++++++++++++ kinetic/x86_64/Makefile | 1 + 5 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 kinetic/Makefile create mode 100644 kinetic/x86_64/Dockerfile create mode 100644 kinetic/x86_64/Makefile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87b4efb..f0c0ba2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,17 +18,5 @@ before_script: - make -C ${CI_JOB_NAME} - '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push' -jammy: - <<: *build_job - -impish: - <<: *build_job - -hirsute: - <<: *build_job - -focal: - <<: *build_job - -bionic: +kinetic: <<: *build_job diff --git a/Makefile b/Makefile index 9c2356c..43b70c7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TARGETS := bionic focal hirsute impish jammy +TARGETS := kinetic TARGETS_PUSH := $(TARGETS:=-push) TARGETS_CLEAN := $(TARGETS:=-clean) diff --git a/kinetic/Makefile b/kinetic/Makefile new file mode 100644 index 0000000..5a52fcc --- /dev/null +++ b/kinetic/Makefile @@ -0,0 +1 @@ +include ../dist_x86_64.mk diff --git a/kinetic/x86_64/Dockerfile b/kinetic/x86_64/Dockerfile new file mode 100644 index 0000000..fd54753 --- /dev/null +++ b/kinetic/x86_64/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:kinetic + +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 liblua5.1-0-dev 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 + +RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin +RUN icinga-provide-go +RUN git config --global --add safe.directory '*' +USER build +ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] +CMD ["icinga-build-package"] diff --git a/kinetic/x86_64/Makefile b/kinetic/x86_64/Makefile new file mode 100644 index 0000000..15497f2 --- /dev/null +++ b/kinetic/x86_64/Makefile @@ -0,0 +1 @@ +include ../../image.mk -- GitLab