From de0cdafa904e6a61eff7eabc9a1adef60405634e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Fri, 24 Mar 2017 18:44:38 +0100 Subject: [PATCH] Add docker target for running test with Docker Add standard container definition for running the tests, to make things easier for developers on other platforms. --- .dockerignore | 2 ++ Dockerfile | 18 ++++++++++++++++++ dev.mk.in | 5 +++++ 3 files changed, 25 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..13937aa66 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +.git +**/.vagrant diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..47f1ce1ea --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + gcc \ + make \ + autoconf \ + gperf \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /tmp/build + +COPY . . + +RUN ./autogen.sh \ + && ./configure \ + && make \ + && make test diff --git a/dev.mk.in b/dev.mk.in index 06deaaaa0..9b681beac 100644 --- a/dev.mk.in +++ b/dev.mk.in @@ -7,6 +7,7 @@ ASCIIDOC = asciidoc CPPCHECK = cppcheck CPPCHECK_SUPPRESSIONS = cppcheck-suppressions.txt SCAN_BUILD = scan-build +DOCKER = docker GPERF = gperf XSLTPROC = xsltproc MANPAGE_XSL = $(shell if [ -e /usr/local/etc/asciidoc/docbook-xsl/manpage.xsl ]; \ @@ -167,4 +168,8 @@ analyze: $(SCAN_BUILD) --use-cc=$(CC) ./configure $(SCAN_BUILD) --use-cc=$(CC) --status-bugs $(MAKE) -B +.PHONY: docker +docker: Dockerfile + $(DOCKER) build $(srcdir) + -include .deps/*.d -- 2.47.2