Merge branch 'new-master'

dev_env/debian/base/10/Dockerfile

@@ -44,6 +44,7 @@ RUN	apt-get install -y \
 	python-docutils \
 	python-pysnmp4 \
 	software-properties-common \
+	sudo \
 	tcl-dev \
 	uuid-dev \
 	valgrind \
@@ -88,11 +89,12 @@ ENV	PKG_CONFIG_PATH=/usr/lib64/pkgconfig \
 	DEBIAN_FRONTEND=
 
 # create dependency cache
-#RUN	mkdir /local_dep_cache && \
-#	wget -nv https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.9.tar.gz -O /local_dep_cache/elasticsearch-5.6.9.tar.gz  && \
-#	wget -nv https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0.tar.gz -O /local_dep_cache/elasticsearch-6.0.0.tar.gz && \
-#	wget -nv https://downloads.apache.org/zookeeper/zookeeper-3.6.2/apache-zookeeper-3.6.2-bin.tar.gz -O /local_dep_cache/apache-zookeeper-3.6.2-bin.tar.gz  && \
-#	wget -nv http://www-us.apache.org/dist/kafka/2.7.0/kafka_2.12-2.7.0.tgz -O /local_dep_cache/kafka_2.12-2.7.0.tgz
+RUN	mkdir /local_dep_cache && \
+	wget -nv https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.9.tar.gz -O /local_dep_cache/elasticsearch-5.6.9.tar.gz
+RUN	wget -nv https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0.tar.gz -O /local_dep_cache/elasticsearch-6.0.0.tar.gz
+RUN	wget -nv https://www.rsyslog.com/files/download/rsyslog/elasticsearch-7.14.1-linux-x86_64.tar.gz -O /local_dep_cache/elasticsearch-7.14.1-linux-x86_64.tar.gz
+RUN	wget -nv https://dlcdn.apache.org/zookeeper/zookeeper-3.6.3/apache-zookeeper-3.6.3-bin.tar.gz -O /local_dep_cache/apache-zookeeper-3.6.2-bin.tar.gz
+RUN	wget -nv https://www.apache.org/dyn/closer.cgi?path=/kafka/2.8.0/kafka_2.13-2.8.0.tgz -O /local_dep_cache/kafka_2.13-2.8.0.tgz
 # tell tests which are the newester versions, so they can be checked without the need
 # to adjust test sources.
 #ENV	ELASTICSEARCH_NEWEST="elasticsearch-6.3.1.tar.gz"

dev_env/debian/base/11/Dockerfile

@@ -0,0 +1,313 @@
+# container for rsyslog development
+# creates the build environment
+FROM	debian:11
+ENV	DEBIAN_FRONTEND=noninteractive
+RUN 	apt-get update && \
+	apt-get upgrade -y
+RUN	apt-get install -y \
+	autoconf \
+	autoconf-archive \
+	automake \
+	autotools-dev \
+	bison \
+	clang \
+	curl \
+	default-jdk \
+	faketime \
+	flex \
+	gdb \
+	git \
+	libcurl4-gnutls-dev \
+	libdbd-mysql \
+	libdbi-dev \
+	libgcrypt20-dev \
+	libglib2.0-dev \
+	libgnutls28-dev \
+	libgrok1 libgrok-dev \
+	libhiredis-dev \
+	libkrb5-dev \
+	liblz4-dev \
+	default-libmysqlclient-dev \
+	libnet1-dev \
+	libpcap-dev \
+	libpq-dev \
+	libsasl2-dev \
+	libsnmp-dev \
+	libssl-dev \
+	libsystemd-dev \
+	libtokyocabinet-dev \
+	libtool \
+	libzstd-dev \
+	default-mysql-server \
+	net-tools \
+	pkg-config \
+	postgresql-client \
+	python3-docutils \
+	python3-pysnmp4 \
+	software-properties-common \
+	tcl-dev \
+	uuid-dev \
+	valgrind \
+	vim \
+	wget \
+	zlib1g-dev \
+	zstd
+#	libbson-dev
+#	libmaxminddb-dev 
+#	libmongoc-dev 
+#RUN     add-apt-repository ppa:adiscon/v8-stable -y && \
+#	add-apt-repository ppa:qpid/released -y && \
+#	add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
+#	echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" > /etc/apt/sources.list.d/llvm.list && \
+#	wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \
+#	echo "deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-draft/xUbuntu_16.04/ ./" > /etc/apt/sources.list.d/0mq.list && \
+#	wget -O - http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-draft/xUbuntu_16.04/Release.key | apt-key add -
+# note: ppa:ubuntu-toolchain-r/test is currently the best repo for gcc-7 we can find...
+
+RUN	apt-get update -y && \
+	apt-get install -y \
+	libestr-dev \
+	libsodium-dev
+#	clang-tools-5.0 
+#	libfastjson-dev 
+#	libczmq-dev 
+#	clang-5.0 
+#	gcc-7 
+#	libqpid-proton10-dev 
+
+WORKDIR	/home/devel
+RUN	groupadd rsyslog \
+	&& useradd -g rsyslog  -s /bin/bash rsyslog \
+	&& echo "rsyslog ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+# we need this for sudo to work...
+RUN	mkdir /rsyslog \
+	&& chown rsyslog:rsyslog /rsyslog
+VOLUME	/rsyslog
+ENV	PKG_CONFIG_PATH=/usr/lib64/pkgconfig \
+	xLD_LIBRARY_PATH=/usr/lib \
+	DEBIAN_FRONTEND=
+
+# create dependency cache
+RUN	mkdir /local_dep_cache && \
+	wget -nv https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.9.tar.gz -O /local_dep_cache/elasticsearch-5.6.9.tar.gz
+RUN	wget -nv https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.0.0.tar.gz -O /local_dep_cache/elasticsearch-6.0.0.tar.gz
+RUN	wget -nv https://www.rsyslog.com/files/download/rsyslog/elasticsearch-7.14.1-linux-x86_64.tar.gz -O /local_dep_cache/elasticsearch-7.14.1-linux-x86_64.tar.gz
+RUN	wget -nv https://dlcdn.apache.org/zookeeper/zookeeper-3.6.3/apache-zookeeper-3.6.3-bin.tar.gz -O /local_dep_cache/apache-zookeeper-3.6.2-bin.tar.gz
+RUN	wget -nv https://www.apache.org/dyn/closer.cgi?path=/kafka/2.8.0/kafka_2.13-2.8.0.tgz -O /local_dep_cache/kafka_2.13-2.8.0.tgz
+# tell tests which are the newester versions, so they can be checked without the need
+# to adjust test sources.
+#ENV	ELASTICSEARCH_NEWEST="elasticsearch-6.3.1.tar.gz"
+
+# bump dependency version below to trigger a dependency rebuild
+# but not a full one (via --no-cache)
+ENV	DEP_VERSION=1
+# Helper projects and dependency build starts here
+RUN	mkdir helper-projects
+# code style checker - not yet packaged
+RUN	cd helper-projects && \
+	git clone https://github.com/rsyslog/codestyle && \
+	cd codestyle && \
+	gcc --std=c99 stylecheck.c -o stylecheck && \
+	mv stylecheck /usr/bin/rsyslog_stylecheck && \
+	cd .. && \
+	rm -r codestyle && \
+	cd ..
+
+# we need Guardtime libksi here, otherwise we cannot check the KSI component	
+RUN	cd helper-projects && \
+	git clone https://github.com/guardtime/libksi.git && \
+	cd libksi && \
+	autoreconf -fvi && \
+	./configure --libdir=/usr/lib64 && \
+	make -j && \
+	make install && \
+	cd .. && \
+	rm -r libksi && \
+	cd ..
+
+#RUN	apt-get install -y \
+#	liblz4-dev
+
+# we need the latest librdkafka as there as always required updates
+#RUN	cd helper-projects && \
+#	git clone https://github.com/edenhill/librdkafka && \
+#	cd librdkafka && \
+#	(unset CFLAGS; ./configure --prefix=/usr --libdir=/usr/lib64 --CFLAGS="-g" ; make -j) && \
+#	make install && \
+#	cd .. && \
+# Note: we do NOT delete the source as we may need it to
+# uninstall (in case the user wants to go back to system-default)
+#	cd ..
+
+# libmongoc is unfortunately not available on openSuse - later?
+#RUN	cd helper-projects && \
+#	wget -nv https://github.com/mongodb/mongo-c-driver/releases/download/1.12.0/mongo-c-driver-1.12.0.tar.gz && \
+#	tar xzf mongo-c-driver-1.12.0.tar.gz && \
+#	cd mongo-c-driver-1.12.0 && \
+#	mkdir cmake-build && \
+#	cmake -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF && \
+#	make -j4 && \
+#	make install && \
+#	cd .. && \
+#	rm -r mongo-c-driver-1.12.0* && \
+#	cd ..
+
+# bump dependency version below to trigger a dependency rebuild
+# but not a full one (via --no-cache)
+ENV	RSYSLOG_DEP_VERSION=2020-01-26
+
+# libestr - currently, not needed, we use from offical repo (unlikely to change)
+#RUN	cd helper-projects && \
+#	git clone https://github.com/rsyslog/libestr.git && \
+#	cd libestr && \
+#	autoreconf -fi && ./configure --libdir=/usr/lib64 --prefix=/usr && \
+#	make -j4 && \
+#	make install && \
+#	cd .. && \
+#	rm -r libestr && \
+#	cd ..
+
+# liblogging
+RUN	cd helper-projects && \
+	git clone https://github.com/rsyslog/liblogging.git && \
+	cd liblogging && \
+	autoreconf -fi && \
+	./configure --prefix=/usr --libdir=/usr/lib64 --disable-journal && \
+	make -j && \
+	make install && \
+	cd .. && \
+	rm -r liblogging && \
+	cd ..
+
+# liblfastjson
+RUN	cd helper-projects && \
+	git clone https://github.com/rsyslog/libfastjson.git && \
+	cd libfastjson && \
+	autoreconf -fi && \
+	./configure --prefix=/usr --libdir=/usr/lib64 && \
+	make -j && \
+	make install && \
+	cd .. && \
+	rm -r libfastjson && \
+	cd ..
+
+# liblognorm
+RUN	cd helper-projects && \
+	git clone https://github.com/rsyslog/liblognorm.git && \
+	cd liblognorm && \
+	autoreconf -fi && \
+	./configure --prefix=/usr --libdir=/usr/lib64 && \
+	make -j && \
+	make install && \
+	cd .. && \
+	rm -r liblognorm && \
+	cd ..
+
+# librelp
+RUN	cd helper-projects && \
+	git clone https://github.com/rsyslog/librelp.git && \
+	cd librelp && \
+	autoreconf -fi && \
+	./configure --prefix=/usr --enable-compile-warnings=yes --libdir=/usr/lib64 && \
+	make -j && \
+	make install && \
+	cd .. && \
+	rm -r librelp && \
+	cd ..
+
+# next ENV is specifically for running scan-build - so we do not need to
+# change scripts if at a later time we can move on to a newer version
+ENV SCAN_BUILD=scan-build \
+    SCAN_BUILD_CC=clang-5.0
+
+ENV RSYSLOG_CONFIGURE_OPTIONS \
+	--enable-elasticsearch \
+	--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 \
+	--enable-libdbi \
+	--enable-libfaketime \
+	--enable-libgcrypt \
+	--enable-libzstd \
+	--enable-mail \
+	--enable-mmanon \
+	--enable-mmaudit \
+	--enable-mmcount \
+	--disable-mmdblookup \
+	--enable-mmfields \
+	--enable-mmgrok \
+	--enable-mmjsonparse \
+	--enable-mmkubernetes \
+	--enable-mmnormalize \
+	--enable-mmpstrucdata \
+	--enable-mmrm1stspace \
+	--enable-mmsequence \
+	--enable-mmsnmptrapd \
+	--enable-mmtaghostname \
+	--enable-mmutf8fix \
+	--enable-mysql \
+	--disable-omamqp1 \
+	--disable-omczmq \
+	--enable-omhiredis \
+	--enable-omhttpfs \
+	--enable-omjournal \
+	--disable-omkafka \
+	--disable-ommongodb \
+	--enable-omprog \
+	--enable-omrelp-default-port=13515 \
+	--enable-omruleset \
+	--enable-omstdout \
+	--enable-omtcl \
+	--enable-omudpspoof \
+	--enable-omuxsock \
+	--enable-openssl \
+	--enable-pgsql \
+	--enable-pmaixforwardedfrom \
+	--enable-pmciscoios \
+	--enable-pmcisconames \
+	--enable-pmdb2diag \
+	--enable-pmlastmsg \
+	--enable-pmnormalize \
+	--enable-pmnull \
+	--enable-pmsnare \
+	--enable-relp \
+	--enable-snmp \
+	--enable-snmp-tests \
+	--enable-usertools \
+	--enable-valgrind \
+	\
+	--enable-testbench
+
+RUN	echo merge me up \
+	&& groupadd -g 999 rsyslog999 \
+	&& groupadd -g 998 rsyslog998 \
+	&& groupadd -g 997 rsyslog997 \
+	&& groupadd -g 996 rsyslog996 \
+	&& groupadd -g 995 rsyslog995 \
+	&& echo missing \
+	&& useradd -u 999 -g rsyslog999  -s /bin/bash rsyslog999 \
+	&& useradd -u 998 -g rsyslog998  -s /bin/bash rsyslog998 \
+	&& useradd -u 997 -g rsyslog997  -s /bin/bash rsyslog997 \
+	&& useradd -u 996 -g rsyslog996  -s /bin/bash rsyslog996 \
+	&& useradd -u 995 -g rsyslog995  -s /bin/bash rsyslog995 \
+	&& echo "rsyslog999 ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \
+	&& echo "rsyslog998 ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \
+	&& echo "rsyslog997 ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \
+	&& echo "rsyslog996 ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers \
+	&& echo "rsyslog995 ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+WORKDIR /rsyslog
+USER rsyslog

dev_env/debian/base/11/build.sh

@@ -0,0 +1,15 @@
+set -e
+docker build $1 -t rsyslog/rsyslog_dev_base_debian:11 .
+printf "\n\n================== BUILD DONE, NOW TESTING CONTAINER:\n"
+docker run --rm -ti rsyslog/rsyslog_dev_base_debian:11 bash -c  "
+set -e && \
+git clone https://github.com/rsyslog/rsyslog.git && \
+cd rsyslog && \
+autoreconf -fi && \
+./configure \$RSYSLOG_CONFIGURE_OPTIONS --enable-compile-warnings=yes  && \
+make -j4
+"
+if [ $? -eq 0 ]; then
+	printf "\nREADY TO PUSH!\n"
+	printf "\ndocker push rsyslog/rsyslog_dev_base_debian:11\n"
+fi

dev_env/debian/base/11/tag-previous.sh

@@ -0,0 +1,2 @@
+docker tag rsyslog/rsyslog_dev_base_debian:11 rsyslog/rsyslog_dev_base_debian:11_previous
+docker push rsyslog/rsyslog_dev_base_debian:11_previous