From 3af293cba20c02b5ab8d8d26fe670af82ff1b78d Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 21 May 2023 20:17:11 +0200 Subject: t/d: move docker-compose.yml to docker/ --- test/docker/Dockerfile | 8 +++++++- test/docker/docker-compose.yml | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 test/docker/docker-compose.yml (limited to 'test/docker') diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 5d4d016..04e66da 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -4,6 +4,12 @@ FROM ubuntu:$DISTRO RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive \ - apt-get install -y --no-install-recommends ca-certificates git + apt-get install -y --no-install-recommends ca-certificates git make RUN git config --global --add safe.directory /src + +COPY [".", "/src"] + +WORKDIR /src + +CMD ["make", "test/local", "test/linux-home"] diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml new file mode 100644 index 0000000..552fadb --- /dev/null +++ b/test/docker/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3' +services: + test: + build: + context: ../.. + dockerfile: test/docker/Dockerfile + args: + DISTRO: "${DISTRO:-xenial}" -- cgit v1.2.3 From a87914970bb985176ad09c422f0942908492de0f Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 21 May 2023 20:23:16 +0200 Subject: t/l: fail unless $CI is set --- test/docker/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/docker') diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml index 552fadb..0689ad3 100644 --- a/test/docker/docker-compose.yml +++ b/test/docker/docker-compose.yml @@ -6,3 +6,5 @@ services: dockerfile: test/docker/Dockerfile args: DISTRO: "${DISTRO:-xenial}" + environment: + CI: y -- cgit v1.2.3