Skip to content
Snippets Groups Projects
Commit d589903a authored by Marek Jaroš's avatar Marek Jaroš :metal:
Browse files

Icinga v 2.13.2

New version:

- Icinga [v2.13.2](https://github.com/Icinga/icinga2/releases/tag/v2.13.2)
- Fixes #1 #2 #3

See merge request !5
parents 6ac8c7e6 c43bf7f0
No related branches found
Tags v2.13.2
1 merge request!5Icinga v 2.13.2
Pipeline #117667 passed
...@@ -10,7 +10,7 @@ before_script: ...@@ -10,7 +10,7 @@ before_script:
build-stable: build-stable:
stage: build stage: build
script: script:
- /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:2 --destination $CI_REGISTRY_IMAGE:2.13 --destination $CI_REGISTRY_IMAGE:2.13.1 - /kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:2 --destination $CI_REGISTRY_IMAGE:2.13 --destination $CI_REGISTRY_IMAGE:2.13.2
only: only:
- stable - stable
......
...@@ -6,7 +6,7 @@ RUN printf "Running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATF ...@@ -6,7 +6,7 @@ RUN printf "Running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATF
# Basic info # Basic info
ARG NAME ARG NAME
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION=2.13.1 ARG VERSION=2.13.2
ARG VCS_REF ARG VCS_REF
ARG VCS_URL ARG VCS_URL
...@@ -22,6 +22,7 @@ LABEL maintainer="Marek Jaroš <jaros@ics.muni.cz>" \ ...@@ -22,6 +22,7 @@ LABEL maintainer="Marek Jaroš <jaros@ics.muni.cz>" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
ENV CODENAME=bullseye ENV CODENAME=bullseye
ENV PACKAGE=2.13.2-1.${CODENAME}
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en
# Prepare environment # Prepare environment
...@@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ...@@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
libconfig-inifiles-perl \ libconfig-inifiles-perl \
libnumber-format-perl \ libnumber-format-perl \
libdatetime-perl \ libdatetime-perl \
libldap-common \
fping \ fping \
squidclient \ squidclient \
rsyslog \ rsyslog \
...@@ -98,14 +100,14 @@ COPY content/ / ...@@ -98,14 +100,14 @@ COPY content/ /
RUN export DEBIAN_FRONTEND=noninteractive \ RUN export DEBIAN_FRONTEND=noninteractive \
&& curl -s https://packages.icinga.com/icinga.key | gpg --dearmor > /usr/share/keyrings/icinga-keyring.gpg \ && curl -s https://packages.icinga.com/icinga.key | gpg --dearmor > /usr/share/keyrings/icinga-keyring.gpg \
&& curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgres-keyring.gpg \ && curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /usr/share/keyrings/postgres-keyring.gpg \
&& echo "deb [signed-by=/usr/share/keyrings/icinga-keyring.gpg] https://packages.icinga.com/debian icinga-$CODENAME main" > /etc/apt/sources.list.d/icinga2.list \ && echo "deb [signed-by=/usr/share/keyrings/icinga-keyring.gpg] https://packages.icinga.com/debian icinga-${CODENAME} main" > /etc/apt/sources.list.d/icinga2.list \
&& echo "deb [signed-by=/usr/share/keyrings/postgres-keyring.gpg] https://apt.postgresql.org/pub/repos/apt/ $CODENAME-pgdg main" > /etc/apt/sources.list.d/$CODENAME-pgdg.list \ && echo "deb [signed-by=/usr/share/keyrings/postgres-keyring.gpg] https://apt.postgresql.org/pub/repos/apt/ ${CODENAME}-pgdg main" > /etc/apt/sources.list.d/${CODENAME}-pgdg.list \
&& apt-get update \ && apt-get update \
&& apt-get install -y -f --no-install-recommends -o DPkg::options::="--force-unsafe-io" \ && apt-get install -y -f --no-install-recommends -o DPkg::options::="--force-unsafe-io" \
icinga2 \ icinga2=${PACKAGE} \
icinga2-bin \ icinga2-bin=${PACKAGE} \
icinga2-common \ icinga2-common=${PACKAGE} \
icinga2-ido-pgsql \ icinga2-ido-pgsql=${PACKAGE} \
postgresql-client-13 \ postgresql-client-13 \
monitoring-plugins \ monitoring-plugins \
monitoring-plugins-contrib \ monitoring-plugins-contrib \
......
...@@ -11,7 +11,7 @@ if evaluate_boolean "${ICINGA2_FEATURE_INFLUXDB}"; then ...@@ -11,7 +11,7 @@ if evaluate_boolean "${ICINGA2_FEATURE_INFLUXDB}"; then
ICINGA2_FEATURE_INFLUXDB_DB=${ICINGA2_FEATURE_INFLUXDB_DB:-icinga2_db} ICINGA2_FEATURE_INFLUXDB_DB=${ICINGA2_FEATURE_INFLUXDB_DB:-icinga2_db}
ICINGA2_FEATURE_INFLUXDB_USER=${ICINGA2_FEATURE_INFLUXDB_USER:-icinga2} ICINGA2_FEATURE_INFLUXDB_USER=${ICINGA2_FEATURE_INFLUXDB_USER:-icinga2}
ICINGA2_FEATURE_INFLUXDB_PASS=${ICINGA2_FEATURE_INFLUXDB_PASS} ICINGA2_FEATURE_INFLUXDB_PASS=${ICINGA2_FEATURE_INFLUXDB_PASS}
ICINGA2_FEATURE_INFLUXDB_SSL=${ICINGA2_FEATURE_INFLUXDB_SSL:-True} ICINGA2_FEATURE_INFLUXDB_SSL=${ICINGA2_FEATURE_INFLUXDB_SSL:-true}
echo "InfluxDB: Enabling Icinga2 InfluxDB writer" echo "InfluxDB: Enabling Icinga2 InfluxDB writer"
......
...@@ -24,7 +24,6 @@ services: ...@@ -24,7 +24,6 @@ services:
hostname: pgsql hostname: pgsql
container_name: pgsql container_name: pgsql
restart: always restart: always
mem_swappiness: 0
networks: networks:
icinet: icinet:
environment: environment:
...@@ -35,7 +34,6 @@ services: ...@@ -35,7 +34,6 @@ services:
container_name: icinga container_name: icinga
restart: always restart: always
hostname: 'icinga' hostname: 'icinga'
mem_swappiness: 0
networks: networks:
icinet: icinet:
ports: ports:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment