diff --git a/Makefile.am b/Makefile.am index f4ce03d8..2d1ded8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,10 @@ man_ROFF_FILES=\ $(man_ADOC_FILES:.adoc=.roff) EXTRA_DIST+=\ - $(man_ADOC_FILES) + $(man_ADOC_FILES) \ + doc/man/example-allow-device.adoc \ + doc/man/example-initial-policy.adoc \ + doc/man/footer.adoc CLEANFILES+=\ $(man_ROFF_FILES) \ diff --git a/scripts/docker/build_on_alpine_linux_3_15.Dockerfile b/scripts/docker/build_on_alpine_linux_3_15.Dockerfile index a86a18a0..5b20958d 100644 --- a/scripts/docker/build_on_alpine_linux_3_15.Dockerfile +++ b/scripts/docker/build_on_alpine_linux_3_15.Dockerfile @@ -18,6 +18,7 @@ FROM alpine:3.15 RUN echo '@edge-testing https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \ && \ apk add --update \ + asciidoc \ autoconf \ automake \ dbus-glib-dev \ @@ -34,10 +35,19 @@ RUN echo '@edge-testing https://dl-cdn.alpinelinux.org/alpine/edge/testing' >> / pegtl@edge-testing \ pkgconf \ polkit-dev \ - protobuf-dev + protobuf-dev \ + tar ADD usbguard.tar usbguard/ ADD catch.tar usbguard/src/ThirdParty/Catch/ WORKDIR usbguard RUN git init &>/dev/null && ./autogen.sh RUN ./configure --with-bundled-catch || ! cat config.log -RUN make V=1 "-j$(nproc)" +RUN make dist +RUN tar --version +RUN tar xf usbguard-*.tar.gz +RUN mv -v usbguard-*.*.*/ usbguard-release/ +RUN mkdir usbguard-release/build/ +WORKDIR usbguard-release/build/ +RUN ../configure --with-bundled-catch || ! cat config.log +RUN bash -c 'set -o pipefail; make V=1 "-j$(nproc)" |& tee build.log' +RUN ! grep -F 'include file not found' build.log diff --git a/scripts/docker/build_on_centos_8_2.Dockerfile b/scripts/docker/build_on_centos_8_2.Dockerfile index a9947c56..fea933dd 100644 --- a/scripts/docker/build_on_centos_8_2.Dockerfile +++ b/scripts/docker/build_on_centos_8_2.Dockerfile @@ -27,6 +27,7 @@ RUN sed \ dnf config-manager --set-enabled PowerTools \ && \ dnf install -y \ + asciidoc \ autoconf \ automake \ dbus-glib-devel \ @@ -49,4 +50,11 @@ ADD pegtl.tar usbguard/src/ThirdParty/PEGTL/ WORKDIR usbguard RUN git init &>/dev/null && ./autogen.sh RUN ./configure --with-bundled-catch --with-bundled-pegtl || ! cat config.log -RUN make V=1 "-j$(nproc)" +RUN make dist +RUN tar xf usbguard-*.tar.gz +RUN mv -v usbguard-*.*.*/ usbguard-release/ +RUN mkdir usbguard-release/build/ +WORKDIR usbguard-release/build/ +RUN ../configure --with-bundled-catch --with-bundled-pegtl || ! cat config.log +RUN bash -c 'set -o pipefail; make V=1 "-j$(nproc)" |& tee build.log' +RUN ! grep -F 'include file not found' build.log diff --git a/scripts/docker/build_on_debian_buster_with_gcc_9_2.Dockerfile b/scripts/docker/build_on_debian_buster_with_gcc_9_2.Dockerfile index dc884cc6..802a3f05 100644 --- a/scripts/docker/build_on_debian_buster_with_gcc_9_2.Dockerfile +++ b/scripts/docker/build_on_debian_buster_with_gcc_9_2.Dockerfile @@ -58,5 +58,12 @@ ADD catch.tar usbguard/src/ThirdParty/Catch/ WORKDIR usbguard RUN git init &>/dev/null && ./autogen.sh RUN ./configure --enable-systemd --with-bundled-catch || ! cat config.log -RUN make V=1 "-j$(nproc)" +RUN make dist +RUN tar xf usbguard-*.tar.gz +RUN mv -v usbguard-*.*.*/ usbguard-release/ +RUN mkdir usbguard-release/build/ +WORKDIR usbguard-release/build/ +RUN ../configure --enable-systemd --with-bundled-catch || ! cat config.log +RUN bash -c 'set -o pipefail; make V=1 "-j$(nproc)" |& tee build.log' +RUN ! grep -F 'include file not found' build.log RUN make V=1 check || { cat src/Tests/test-suite.log ; false ; } diff --git a/scripts/docker/build_on_ubuntu_22_04.Dockerfile b/scripts/docker/build_on_ubuntu_22_04.Dockerfile index 0303dffe..e9214439 100644 --- a/scripts/docker/build_on_ubuntu_22_04.Dockerfile +++ b/scripts/docker/build_on_ubuntu_22_04.Dockerfile @@ -50,5 +50,12 @@ ADD usbguard.tar usbguard/ WORKDIR usbguard RUN git init &>/dev/null && ./autogen.sh RUN ./configure --enable-systemd || ! cat config.log -RUN make V=1 "-j$(nproc)" +RUN make dist +RUN tar xf usbguard-*.tar.gz +RUN mv -v usbguard-*.*.*/ usbguard-release/ +RUN mkdir usbguard-release/build/ +WORKDIR usbguard-release/build/ +RUN ../configure --enable-systemd || ! cat config.log +RUN bash -c 'set -o pipefail; make V=1 "-j$(nproc)" |& tee build.log' +RUN ! grep -F 'include file not found' build.log RUN make V=1 check || { cat src/Tests/test-suite.log ; false ; }