From ff09afdac1213fcfca8335996b6523712a39aa50 Mon Sep 17 00:00:00 2001 From: mmattel Date: Tue, 10 Jan 2023 10:24:10 +0100 Subject: [PATCH 1/4] Add the paho-mqtt-c library as required by the syslog-ng documentation --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Dockerfile.armhf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4fd7ee6..ee19665 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,8 @@ RUN \ syslog-ng-stomp \ syslog-ng-tags-parser \ syslog-ng-xml \ - py3-syslog-ng && \ + py3-syslog-ng \ + paho-mqtt-c && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8a7df94..f51dd88 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,8 @@ RUN \ syslog-ng-stomp \ syslog-ng-tags-parser \ syslog-ng-xml \ - py3-syslog-ng && \ + py3-syslog-ng \ + paho-mqtt-c && \ rm -rf \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 814d74d..51aa7a8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -30,7 +30,8 @@ RUN \ syslog-ng-stomp \ syslog-ng-tags-parser \ syslog-ng-xml \ - py3-syslog-ng && \ + py3-syslog-ng \ + paho-mqtt-c && \ rm -rf \ /tmp/* From 511c05c2f54763c10867159217cbec23ae2db673 Mon Sep 17 00:00:00 2001 From: mmattel Date: Tue, 10 Jan 2023 10:37:08 +0100 Subject: [PATCH 2/4] update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index a8efd61..d0ed652 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.01.23:", desc: "Add paho-mqtt-c library as required by the syslog-ng documentation" } - { date: "30.12.22:", desc: "Rebase to Alpine 3.17, add libdbi-drivers for SQL support." } - { date: "01.10.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3." } - { date: "18.12.21:", desc: "Rebase to Alpine 3.15." } From aed2f844246c25eebe3eb7766f3b069252ac9ee3 Mon Sep 17 00:00:00 2001 From: mmattel Date: Tue, 10 Jan 2023 12:29:48 +0100 Subject: [PATCH 3/4] fix sort order --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee19665..1ebfca9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,8 @@ RUN \ syslog-ng-stomp \ syslog-ng-tags-parser \ syslog-ng-xml \ - py3-syslog-ng \ - paho-mqtt-c && \ + paho-mqtt-c \ + py3-syslog-ng && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f51dd88..f14e615 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,8 +30,8 @@ RUN \ syslog-ng-stomp \ syslog-ng-tags-parser \ syslog-ng-xml \ - py3-syslog-ng \ - paho-mqtt-c && \ + paho-mqtt-c \ + py3-syslog-ng && \ rm -rf \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 51aa7a8..f3669b2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -30,8 +30,8 @@ RUN \ syslog-ng-stomp \ syslog-ng-tags-parser \ syslog-ng-xml \ - py3-syslog-ng \ - paho-mqtt-c && \ + paho-mqtt-c \ + py3-syslog-ng && \ rm -rf \ /tmp/* From 2711f9545ea7e80743d6b0ff11d69ede9114b894 Mon Sep 17 00:00:00 2001 From: mmattel Date: Wed, 11 Jan 2023 09:04:09 +0100 Subject: [PATCH 4/4] fix sort order --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- Dockerfile.armhf | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ebfca9..241f845 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,8 @@ RUN \ fi && \ apk add -U --upgrade --no-cache \ libdbi-drivers \ + paho-mqtt-c \ + py3-syslog-ng \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ @@ -29,9 +31,7 @@ RUN \ syslog-ng-stardate \ syslog-ng-stomp \ syslog-ng-tags-parser \ - syslog-ng-xml \ - paho-mqtt-c \ - py3-syslog-ng && \ + syslog-ng-xml && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f14e615..36ff4dd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,6 +16,8 @@ RUN \ fi && \ apk add -U --upgrade --no-cache \ libdbi-drivers \ + paho-mqtt-c \ + py3-syslog-ng \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ @@ -29,9 +31,7 @@ RUN \ syslog-ng-stardate \ syslog-ng-stomp \ syslog-ng-tags-parser \ - syslog-ng-xml \ - paho-mqtt-c \ - py3-syslog-ng && \ + syslog-ng-xml && \ rm -rf \ /tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f3669b2..c2acc2c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -16,6 +16,8 @@ RUN \ fi && \ apk add -U --upgrade --no-cache \ libdbi-drivers \ + paho-mqtt-c \ + py3-syslog-ng \ syslog-ng==${SYSLOG_NG_VERSION} \ syslog-ng-add-contextual-data \ syslog-ng-amqp \ @@ -29,9 +31,7 @@ RUN \ syslog-ng-stardate \ syslog-ng-stomp \ syslog-ng-tags-parser \ - syslog-ng-xml \ - paho-mqtt-c \ - py3-syslog-ng && \ + syslog-ng-xml && \ rm -rf \ /tmp/*