From 7e5e4bc5bc3b4b13b67a76f88e33696269c5faf1 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 5 Jan 2023 10:45:37 +0100 Subject: [PATCH] Integrate icinga2 daemon -C into Dockerfile to have it on all platforms. --- Dockerfile | 9 ++++++++- build.bash | 2 -- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a39395..e3b4c23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,7 +91,7 @@ RUN strip -g /icinga2-bin/usr/lib/nagios/plugins/check_nscp_api RUN rm -rf /icinga2-bin/usr/share/doc/icinga2/markdown -FROM debian:bullseye-slim +FROM debian:bullseye-slim as icinga2 RUN ["/bin/bash", "-exo", "pipefail", "-c", "apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install --no-install-{recommends,suggests} -y ca-certificates curl dumb-init libboost-{context,coroutine,date-time,filesystem,iostreams,program-options,regex,system,thread}1.74.0 libcap2-bin libedit2 libldap-common libmariadb3 libmoosex-role-timer-perl libpq5 libssl1.1 mailutils monitoring-plugins msmtp{,-mta} openssh-client openssl; apt-get clean; rm -vrf /var/lib/apt/lists/*"] @@ -114,3 +114,10 @@ RUN ["bash", "-exo", "pipefail", "-c", "for d in /etc/icinga2 /var/*/icinga2; do EXPOSE 5665 USER icinga CMD ["icinga2", "daemon"] + + +FROM icinga2 as test-icinga2 +RUN ["icinga2", "daemon", "-C"] + + +FROM icinga2 diff --git a/build.bash b/build.bash index 4dbee6d..e63a28b 100755 --- a/build.bash +++ b/build.bash @@ -32,5 +32,3 @@ cp -a "${BLDCTX}/." "$TMPBLDCTX" git clone "file://${I2SRC}/.git" "${TMPBLDCTX}/icinga2-src" docker buildx build --platform "$(echo linux/{amd64,arm{/v7,64/v8}} |tr ' ' ,)" -f "${TMPBLDCTX}/Dockerfile" -t icinga/icinga2 "$TMPBLDCTX" - -docker run --rm icinga/icinga2 icinga2 daemon -C