From bfe4bd0843a4b966ad18363252adb888fb509cc3 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sat, 2 Mar 2019 13:59:02 +0100
Subject: [PATCH] dev_env debian 8 / centos 7: enable new modules

---
 dev_env/centos/base/7/Dockerfile          | 8 +++++++-
 dev_env/centos/base/7/tag-previous.sh     | 2 ++
 dev_env/centos/buildbot/7/tag-previous.sh | 2 ++
 dev_env/debian/base/8/Dockerfile          | 7 +++++++
 dev_env/debian/buildbot/8/tag-previous.sh | 2 ++
 5 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 dev_env/centos/base/7/tag-previous.sh
 create mode 100644 dev_env/centos/buildbot/7/tag-previous.sh
 create mode 100644 dev_env/debian/buildbot/8/tag-previous.sh

diff --git a/dev_env/centos/base/7/Dockerfile b/dev_env/centos/base/7/Dockerfile
index 73d881d..5958224 100644
--- a/dev_env/centos/base/7/Dockerfile
+++ b/dev_env/centos/base/7/Dockerfile
@@ -33,6 +33,7 @@ RUN	yum -y update && \
 	libgcrypt-devel \
 	libmaxminddb-devel \
 	libnet libnet-devel \
+	libpcap-devel \
 	libstdc++ \
 	libtool \
 	libuuid-devel \
@@ -156,13 +157,17 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-elasticsearch-tests \
 	--enable-gnutls \
 	--enable-gssapi-krb5 \
+	--enable-imbatchreport \
 	--enable-imczmq \
 	--enable-imdiag \
 	--enable-imfile \
 	--enable-imjournal \
 	--enable-imkafka \
 	--enable-impstats \
+	--enable-improg \
 	--enable-imptcp \
+	--enable-impcap \
+	--enable-imtuxedolog \
 	--enable-kafka-tests \
 	--enable-ksi-ls12 \
 	--enable-libdbi \
@@ -181,6 +186,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-mmrm1stspace \
 	--enable-mmsequence \
 	--enable-mmsnmptrapd \
+	--enable-mmtaghostname \
 	--enable-mmutf8fix \
 	--enable-mysql \
 	--enable-omamqp1 \
@@ -200,8 +206,8 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-omuxsock \
 	--enable-openssl \
 	--enable-pgsql \
-	--enable-pmaixforwardedfrom \
 	--enable-pmciscoios \
+	--enable-pmdb2diag \
 	--enable-pmcisconames \
 	--enable-pmlastmsg \
 	--enable-pmnormalize \
diff --git a/dev_env/centos/base/7/tag-previous.sh b/dev_env/centos/base/7/tag-previous.sh
new file mode 100644
index 0000000..50a8212
--- /dev/null
+++ b/dev_env/centos/base/7/tag-previous.sh
@@ -0,0 +1,2 @@
+docker tag rsyslog/rsyslog_dev_base_centos:7 rsyslog/rsyslog_dev_base_centos:7_previous
+docker push rsyslog/rsyslog_dev_base_centos:7_previous
diff --git a/dev_env/centos/buildbot/7/tag-previous.sh b/dev_env/centos/buildbot/7/tag-previous.sh
new file mode 100644
index 0000000..7e49ecc
--- /dev/null
+++ b/dev_env/centos/buildbot/7/tag-previous.sh
@@ -0,0 +1,2 @@
+docker tag rsyslog/rsyslog_dev_buildbot_centos:7 rsyslog/rsyslog_dev_buildbot_centos:7_previous
+docker push rsyslog/rsyslog_dev_buildbot_centos:7_previous
diff --git a/dev_env/debian/base/8/Dockerfile b/dev_env/debian/base/8/Dockerfile
index ef89020..ffd36d6 100644
--- a/dev_env/debian/base/8/Dockerfile
+++ b/dev_env/debian/base/8/Dockerfile
@@ -29,6 +29,7 @@ RUN	apt-get install -y \
 	liblz4-dev \
 	libmysqlclient-dev \
 	libnet1-dev \
+	libpcap-dev \
 	libpq-dev \
 	libsasl2-dev \
 	libsnmp-dev \
@@ -219,13 +220,17 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-elasticsearch-tests \
 	--enable-gnutls \
 	--enable-gssapi-krb5 \
+	--enable-imbatchreport \
 	--disable-imczmq \
 	--enable-imdiag \
 	--enable-imfile \
 	--enable-imjournal \
 	--disable-imkafka \
 	--enable-impstats \
+	--enable-improg \
 	--enable-imptcp \
+	--enable-impcap \
+	--enable-imtuxedolog \
 	--disable-kafka-tests \
 	--disable-kmsg \
 	--enable-ksi-ls12 \
@@ -246,6 +251,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-mmrm1stspace \
 	--enable-mmsequence \
 	--enable-mmsnmptrapd \
+	--enable-mmtaghostname \
 	--enable-mmutf8fix \
 	--enable-mysql \
 	--disable-omamqp1 \
@@ -267,6 +273,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
 	--enable-pmaixforwardedfrom \
 	--enable-pmciscoios \
 	--enable-pmcisconames \
+	--enable-pmdb2diag \
 	--enable-pmlastmsg \
 	--enable-pmnormalize \
 	--enable-pmnull \
diff --git a/dev_env/debian/buildbot/8/tag-previous.sh b/dev_env/debian/buildbot/8/tag-previous.sh
new file mode 100644
index 0000000..908f7d3
--- /dev/null
+++ b/dev_env/debian/buildbot/8/tag-previous.sh
@@ -0,0 +1,2 @@
+docker tag rsyslog/rsyslog_dev_base_debian:8 rsyslog/rsyslog_dev_base_debian:8_previous
+docker push rsyslog/rsyslog_dev_base_debian:8_previous