diff --git a/Dockerfile b/Dockerfile index 5643992..685fa8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,11 +13,8 @@ RUN apk update && \ RUN git clone --recursive "$GIT_URL" /tmp/ripe-atlas-software-probe WORKDIR /tmp/ripe-atlas-software-probe -# version 5100 -RUN git checkout 5100 - -# APPLY Alpine Linux specific patch -RUN git apply /tmp/alpinelinux-fix-sys-reboot.patch +# version 5110 +RUN git checkout 5110 RUN autoreconf -iv RUN ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 --runstatedir=/run --with-user=ripe-atlas --with-group=ripe-atlas --with-measurement-user=ripe-atlas --disable-systemd --enable-chown --enable-setcap-install diff --git a/alpinelinux-fix-sys-reboot.patch b/alpinelinux-fix-sys-reboot.patch deleted file mode 100644 index 2c77f39..0000000 --- a/alpinelinux-fix-sys-reboot.patch +++ /dev/null @@ -1,16 +0,0 @@ -This patch is intended to fix reboot.h implict declaration issue when compile on Alpine Linux - -Based on : https://github.com/RIPE-NCC/ripe-atlas-software-probe/pull/118 - -diff --git a/probe-busybox/networking/telnetd.c b/probe-busybox/networking/telnetd.c -index 543de5a..8a67651 100644 ---- a/probe-busybox/networking/telnetd.c -+++ b/probe-busybox/networking/telnetd.c -@@ -134,6 +134,7 @@ - #include - #include - #include -+#include - - #define LOGIN_PREFIX "Atlas probe, see http://atlas.ripe.net/\r\n\r\n" - #define LOGIN_PROMPT " login: "