Commit c517bfea authored by Michał Kępień's avatar Michał Kępień
Browse files

Fix dnstap installation conditions

dnstap dependencies are currently unconditionally included in Alpine
Linux images.  Only install them if the relevant Makefile variable is
set.

Tweak the condition for installing dnstap dependencies on CentOS so that
it matches its Debian counterpart.
parent 0be3b668
...@@ -31,6 +31,7 @@ abi_check_debian_buster_amd64 := yes ...@@ -31,6 +31,7 @@ abi_check_debian_buster_amd64 := yes
coccinelle_debian_buster_amd64 := yes coccinelle_debian_buster_amd64 := yes
compiledb_debian_buster_amd64 := yes compiledb_debian_buster_amd64 := yes
cppcheck_debian_buster_amd64 := yes cppcheck_debian_buster_amd64 := yes
dnstap_alpine_3.11_amd64 := yes
dnstap_debian_buster_amd64 := yes dnstap_debian_buster_amd64 := yes
dnstap_centos_centos7_amd64 := yes dnstap_centos_centos7_amd64 := yes
dnstap_debian_sid_amd64 := yes dnstap_debian_sid_amd64 := yes
......
...@@ -10,7 +10,6 @@ RUN apk add \ ...@@ -10,7 +10,6 @@ RUN apk add \
ccache \ ccache \
cmocka-dev \ cmocka-dev \
curl \ curl \
fstrm-dev \
gdb \ gdb \
geoip-dev \ geoip-dev \
git \ git \
...@@ -31,7 +30,6 @@ RUN apk add \ ...@@ -31,7 +30,6 @@ RUN apk add \
perl-json \ perl-json \
perl-net-dns \ perl-net-dns \
perl-xml-simple \ perl-xml-simple \
protobuf-c-dev \
py3-dnspython \ py3-dnspython \
py3-ply \ py3-ply \
python3 \ python3 \
...@@ -41,5 +39,6 @@ RUN apk add \ ...@@ -41,5 +39,6 @@ RUN apk add \
lutok-dev \ lutok-dev \
lua5.3-libs \ lua5.3-libs \
sqlite-dev sqlite-dev
RUN if [ "@DNSTAP@" = "yes" ]; then apk add fstrm-dev protobuf-c-dev; fi
RUN mkdir /usr/src && curl -sSL "https://github.com/Mno-hime/kyua/archive/${KYUA_GIT_COMMIT}.tar.gz" | tar -xz -C /usr/src RUN mkdir /usr/src && curl -sSL "https://github.com/Mno-hime/kyua/archive/${KYUA_GIT_COMMIT}.tar.gz" | tar -xz -C /usr/src
RUN cd "/usr/src/kyua-${KYUA_GIT_COMMIT}" && ./configure --prefix /usr && make && make install && cd .. && rm -rf /usr/tests "/usr/src/kyua-${KYUA_GIT_COMMIT}" RUN cd "/usr/src/kyua-${KYUA_GIT_COMMIT}" && ./configure --prefix /usr && make && make install && cd .. && rm -rf /usr/tests "/usr/src/kyua-${KYUA_GIT_COMMIT}"
...@@ -55,7 +55,7 @@ RUN if [ "@VERSION@" = "centos6" ]; then yum -y install \ ...@@ -55,7 +55,7 @@ RUN if [ "@VERSION@" = "centos6" ]; then yum -y install \
python34-ply \ python34-ply \
python34-setuptools \ python34-setuptools \
; fi ; fi
RUN if [ -n "@DNSTAP@" ]; then yum -y install fstrm-devel protobuf-c-devel; fi RUN if [ "@DNSTAP@" = "yes" ]; then yum -y install fstrm-devel protobuf-c-devel; fi
RUN if [ "@VERSION@" != "centos7" ]; then curl -sSL https://github.com/libuv/libuv/archive/v$LIBUV_VERSION.tar.gz | tar -xz -C /usr/src; fi RUN if [ "@VERSION@" != "centos7" ]; then curl -sSL https://github.com/libuv/libuv/archive/v$LIBUV_VERSION.tar.gz | tar -xz -C /usr/src; fi
RUN if [ "@VERSION@" != "centos7" ]; then cd /usr/src/libuv-$LIBUV_VERSION && ./autogen.sh && ./configure --prefix /usr && make && make install; fi RUN if [ "@VERSION@" != "centos7" ]; then cd /usr/src/libuv-$LIBUV_VERSION && ./autogen.sh && ./configure --prefix /usr && make && make install; fi
RUN if [ "@VERSION@" = "centos6" ]; then curl -sSL https://github.com/rthalley/dnspython/archive/v$DNSPYTHON_VERSION.tar.gz | tar -xz -C /usr/src; fi RUN if [ "@VERSION@" = "centos6" ]; then curl -sSL https://github.com/rthalley/dnspython/archive/v$DNSPYTHON_VERSION.tar.gz | tar -xz -C /usr/src; fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment