Skip to content
Permalink
Browse files

Merge branch 'master' of http://github.com/rsyslog/rsyslog-docker

  • Loading branch information...
rgerhards committed Mar 2, 2019
2 parents bfe4bd0 + 009195e commit 9339b2ed26bf2cbd22285f12dea5de60185d1f5a
@@ -35,6 +35,7 @@ RUN apt-get update && \
libmongoc-dev \
libmysqlclient-dev \
libnet1-dev \
libpcap-dev \
libsnmp-dev \
libssl-dev libsasl2-dev \
libsystemd-dev \
@@ -126,13 +127,16 @@ 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-impcap \
--enable-impstats \
--enable-imptcp \
--enable-imtuxedoulog \
--enable-kafka-tests \
--enable-ksi-ls12 \
--enable-libdbi \
@@ -142,6 +146,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
--enable-mmanon \
--enable-mmaudit \
--enable-mmcount \
--enable-mmcapture \
--enable-mmdblookup \
--enable-mmfields \
--enable-mmgrok \
@@ -160,6 +165,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
--enable-omhiredis \
--enable-omhiredis \
--enable-omhttpfs \
--enable-omhttp \
--enable-omjournal \
--enable-omkafka \
--enable-ommongodb \
@@ -174,6 +180,7 @@ ENV RSYSLOG_CONFIGURE_OPTIONS \
--enable-pgsql \
--enable-pmaixforwardedfrom \
--enable-pmciscoios \
--enable-pmdb2diag \
--enable-pmcisconames \
--enable-pmlastmsg \
--enable-pmnormalize \
@@ -1,4 +1,4 @@
FROM rsyslog/rsyslog_dev_base_ubuntu:18.04
FROM rsyslog/rsyslog_dev_base_ubuntu-arm:18.04
USER root
RUN apt-get update && apt-get install -y \
python-dev \
@@ -1 +1 @@
docker build $1 -t rsyslog/rsyslog_dev_buildbot_ubuntu:18.04 .
docker build $1 -t rsyslog/rsyslog_dev_buildbot_ubuntu-arm:18.04 .

0 comments on commit 9339b2e

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.