Merge pull request #615 from burgerrg/master

Update syslog-ng.conf for Ubuntu 22.04
2026-03-26 12:29:07 +00:00 · 2022-05-31 18:48:43 +03:00 · 2022-05-31 11:32:15 -04:00 · 2022-05-23 23:38:59 +03:00 · 2022-05-23 23:38:37 +03:00 · 2022-05-23 23:32:20 +03:00
2 changed files with 2 additions and 2 deletions
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:20.04
+ARG BASE_IMAGE=ubuntu:22.04
 FROM $BASE_IMAGE
 ARG QEMU_ARCH
--- a/image/services/syslog-ng/syslog-ng.conf
+++ b/image/services/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.25
+@version: 3.35
@include "scl.conf"
 # Syslog-ng configuration file, compatible with default Debian syslogd
Author	SHA1	Message	Date
Skyler Mäntysaari	69afe4954c	Merge pull request #615 from burgerrg/master Update syslog-ng.conf for Ubuntu 22.04	2022-05-31 18:48:43 +03:00
Bob Burger	0b5441c268	Update syslog-ng.conf for Ubuntu 22.04	2022-05-31 11:32:15 -04:00
Skyler Mäntysaari	d2fbf3ad28	Merge pull request #614 from phusion/revert-613-jammy-patch-01 Revert "Added retreval of ubuntu key 871920D1991BC93C to apt keyring"	2022-05-23 23:38:59 +03:00
Skyler Mäntysaari	e2f180f35a	Revert "Update prepare.sh (#613 )" This reverts commit `aa4a3a5778`.	2022-05-23 23:38:37 +03:00
Skyler Mäntysaari	aa4a3a5778	Update prepare.sh (#613 ) Hopefully fix #612	2022-05-23 23:32:20 +03:00
Skyler Mäntysaari	29f719fe03	Image: Upgrade to Ubuntu 22.04. (#611 )	2022-05-18 19:34:12 +03:00