diff --git a/Dockerfile b/Dockerfile index dd21c158..22c6a390 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Dockerfile for icinga2 with icingaweb2 # https://github.com/jjethwa/icinga2 -FROM debian:bullseye +FROM debian:bookworm ENV APACHE2_HTTP=REDIRECT \ ICINGA2_FEATURE_GRAPHITE=false \ @@ -49,7 +49,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ php-gmp \ procps \ pwgen \ - python \ + python3 \ python3-requests \ snmp \ msmtp \ @@ -86,23 +86,23 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ARG GITREF_MODGRAPHITE=master ARG GITREF_MODAWS=master ARG GITREF_REACTBUNDLE=v0.9.0 -ARG GITREF_INCUBATOR=v0.18.0 +ARG GITREF_INCUBATOR=v0.22.0 ARG GITREF_IPL=v0.5.0 RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ # Icinga Director && mkdir -p /usr/local/share/icingaweb2/modules/director/ \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/v1.9.1.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/v1.11.3.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/director --exclude=.gitignore -f - \ # Icingaweb2 Graphite && mkdir -p /usr/local/share/icingaweb2/modules/graphite \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.2.0.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.2.4.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/graphite -f - \ # Icingaweb2 AWS && mkdir -p /usr/local/share/icingaweb2/modules/aws \ && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-aws/archive/v1.1.0.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/aws -f - \ - && wget -q --no-cookies "https://github.com/aws/aws-sdk-php/releases/download/3.222.8/aws.zip" \ + && wget -q --no-cookies "https://github.com/aws/aws-sdk-php/releases/download/3.336.3/aws.zip" \ && unzip -d /usr/local/share/icingaweb2/modules/aws/library/vendor/aws aws.zip \ && rm aws.zip \ # Module Reactbundle @@ -111,7 +111,7 @@ RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/reactbundle -f - \ # Module Incubator && mkdir -p /usr/local/share/icingaweb2/modules/incubator/ \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-incubator/archive/v0.18.0.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-incubator/archive/v0.22.0.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/incubator -f - \ # Module Ipl && mkdir -p /usr/local/share/icingaweb2/modules/ipl/ \ @@ -119,10 +119,10 @@ RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/ipl -f - \ # Module x509 && mkdir -p /usr/local/share/icingaweb2/modules/x509/ \ - && wget -q --no-cookies "https://github.com/Icinga/icingaweb2-module-x509/archive/v1.1.2.zip" \ - && unzip -d /usr/local/share/icingaweb2/modules/x509 v1.1.2.zip \ - && mv /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.1.2/* /usr/local/share/icingaweb2/modules/x509/ \ - && rm -rf /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.1.2/ \ + && wget -q --no-cookies "https://github.com/Icinga/icingaweb2-module-x509/archive/v1.3.2.zip" \ + && unzip -d /usr/local/share/icingaweb2/modules/x509 v1.3.2.zip \ + && mv /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.3.2/* /usr/local/share/icingaweb2/modules/x509/ \ + && rm -rf /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.3.2/ \ && true ADD content/ / diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 933b53b4..ded8200d 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -1,5 +1,5 @@ # Dockerfile for icinga2 with icingaweb2 -FROM debian:bullseye AS qemu_arm32 +FROM debian:bookworm AS qemu_arm32 #QEMU Download ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bdev.2%2Bjenkins-balena-qemu-21/qemu-4.0.0.dev.2.jenkins-balena-qemu-21-arm.tar.gz @@ -57,7 +57,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ php-gmp \ procps \ pwgen \ - python \ + python3 \ python3-requests \ snmp \ msmtp \ @@ -94,23 +94,23 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ARG GITREF_MODGRAPHITE=master ARG GITREF_MODAWS=master ARG GITREF_REACTBUNDLE=v0.9.0 -ARG GITREF_INCUBATOR=v0.18.0 +ARG GITREF_INCUBATOR=v0.22.0 ARG GITREF_IPL=v0.5.0 RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ # Icinga Director && mkdir -p /usr/local/share/icingaweb2/modules/director/ \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/v1.9.1.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/v1.11.3.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/director --exclude=.gitignore -f - \ # Icingaweb2 Graphite && mkdir -p /usr/local/share/icingaweb2/modules/graphite \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.2.0.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.2.4.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/graphite -f - \ # Icingaweb2 AWS && mkdir -p /usr/local/share/icingaweb2/modules/aws \ && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-aws/archive/v1.1.0.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/aws -f - \ - && wget -q --no-cookies "https://github.com/aws/aws-sdk-php/releases/download/3.222.8/aws.zip" \ + && wget -q --no-cookies "https://github.com/aws/aws-sdk-php/releases/download/3.336.3/aws.zip" \ && unzip -d /usr/local/share/icingaweb2/modules/aws/library/vendor/aws aws.zip \ && rm aws.zip \ # Module Reactbundle @@ -119,7 +119,7 @@ RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/reactbundle -f - \ # Module Incubator && mkdir -p /usr/local/share/icingaweb2/modules/incubator/ \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-incubator/archive/v0.18.0.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-incubator/archive/v0.22.0.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/incubator -f - \ # Module Ipl && mkdir -p /usr/local/share/icingaweb2/modules/ipl/ \ @@ -127,10 +127,10 @@ RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/ipl -f - \ # Module x509 && mkdir -p /usr/local/share/icingaweb2/modules/x509/ \ - && wget -q --no-cookies "https://github.com/Icinga/icingaweb2-module-x509/archive/v1.1.2.zip" \ - && unzip -d /usr/local/share/icingaweb2/modules/x509 v1.1.2.zip \ - && mv /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.1.2/* /usr/local/share/icingaweb2/modules/x509/ \ - && rm -rf /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.1.2/ \ + && wget -q --no-cookies "https://github.com/Icinga/icingaweb2-module-x509/archive/v1.3.2.zip" \ + && unzip -d /usr/local/share/icingaweb2/modules/x509 v1.3.2.zip \ + && mv /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.3.2/* /usr/local/share/icingaweb2/modules/x509/ \ + && rm -rf /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.3.2/ \ && true ADD content/ / diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index b5fc5839..7b800f8b 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -1,5 +1,5 @@ # Dockerfile for icinga2 with icingaweb2 -FROM debian:bullseye AS qemu_arm64 +FROM debian:bookworm AS qemu_arm64 #QEMU Download ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v4.0.0%2Bdev.2%2Bjenkins-balena-qemu-21/qemu-4.0.0.dev.2.jenkins-balena-qemu-21-aarch64.tar.gz @@ -58,7 +58,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ php-gmp \ procps \ pwgen \ - python \ + python3 \ python3-requests \ snmp \ msmtp \ @@ -95,23 +95,23 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ARG GITREF_MODGRAPHITE=master ARG GITREF_MODAWS=master ARG GITREF_REACTBUNDLE=v0.9.0 -ARG GITREF_INCUBATOR=v0.18.0 +ARG GITREF_INCUBATOR=v0.22.0 ARG GITREF_IPL=v0.5.0 RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ # Icinga Director && mkdir -p /usr/local/share/icingaweb2/modules/director/ \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/v1.9.1.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-director/archive/v1.11.3.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/director --exclude=.gitignore -f - \ # Icingaweb2 Graphite && mkdir -p /usr/local/share/icingaweb2/modules/graphite \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.2.0.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.2.4.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/graphite -f - \ # Icingaweb2 AWS && mkdir -p /usr/local/share/icingaweb2/modules/aws \ && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-aws/archive/v1.1.0.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/aws -f - \ - && wget -q --no-cookies "https://github.com/aws/aws-sdk-php/releases/download/3.222.8/aws.zip" \ + && wget -q --no-cookies "https://github.com/aws/aws-sdk-php/releases/download/3.336.3/aws.zip" \ && unzip -d /usr/local/share/icingaweb2/modules/aws/library/vendor/aws aws.zip \ && rm aws.zip \ # Module Reactbundle @@ -120,7 +120,7 @@ RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/reactbundle -f - \ # Module Incubator && mkdir -p /usr/local/share/icingaweb2/modules/incubator/ \ - && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-incubator/archive/v0.18.0.tar.gz" \ + && wget -q --no-cookies -O - "https://github.com/Icinga/icingaweb2-module-incubator/archive/v0.22.0.tar.gz" \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/incubator -f - \ # Module Ipl && mkdir -p /usr/local/share/icingaweb2/modules/ipl/ \ @@ -128,10 +128,10 @@ RUN mkdir -p /usr/local/share/icingaweb2/modules/ \ | tar xz --strip-components=1 --directory=/usr/local/share/icingaweb2/modules/ipl -f - \ # Module x509 && mkdir -p /usr/local/share/icingaweb2/modules/x509/ \ - && wget -q --no-cookies "https://github.com/Icinga/icingaweb2-module-x509/archive/v1.1.2.zip" \ - && unzip -d /usr/local/share/icingaweb2/modules/x509 v1.1.2.zip \ - && mv /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.1.2/* /usr/local/share/icingaweb2/modules/x509/ \ - && rm -rf /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.1.2/ \ + && wget -q --no-cookies "https://github.com/Icinga/icingaweb2-module-x509/archive/v1.3.2.zip" \ + && unzip -d /usr/local/share/icingaweb2/modules/x509 v1.3.2.zip \ + && mv /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.3.2/* /usr/local/share/icingaweb2/modules/x509/ \ + && rm -rf /usr/local/share/icingaweb2/modules/x509/icingaweb2-module-x509-1.3.2/ \ && true ADD content/ / diff --git a/README.md b/README.md index 4efe284b..0d8e2657 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ This build is automated by push for the git-repo. Just pull it via: ## Image details -1. Based on debian:bullseye +1. Based on debian:bookworm 1. Key-Features: - icinga2 - icingacli diff --git a/content/opt/setup/20-mysql b/content/opt/setup/20-mysql index 5d36c02d..bcdca77e 100755 --- a/content/opt/setup/20-mysql +++ b/content/opt/setup/20-mysql @@ -9,6 +9,7 @@ } || exit 0 chown -R mysql:mysql /var/lib/mysql +mkdir -p /var/log/mysql chown -R mysql:mysql /var/log/mysql if [ ! "$(ls -A /var/lib/mysql)" ]; then diff --git a/content/usr/local/bin/ini_set b/content/usr/local/bin/ini_set index 726ab08c..2a11bf0a 100755 --- a/content/usr/local/bin/ini_set +++ b/content/usr/local/bin/ini_set @@ -1,6 +1,6 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 -import ConfigParser +import configparser import argparse parser = argparse.ArgumentParser(description='Set values in ini-files.') @@ -12,7 +12,7 @@ parser.add_argument('value', metavar='VALUE', help='Value to set your opti args = parser.parse_args() -config = ConfigParser.ConfigParser() +config = configparser.ConfigParser() config.read(args.file) if not config.has_section(args.section):