From 3af293cba20c02b5ab8d8d26fe670af82ff1b78d Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sun, 21 May 2023 20:17:11 +0200
Subject: t/d: move docker-compose.yml to docker/

---
 test/docker-compose.yml        | 13 -------------
 test/docker/Dockerfile         |  8 +++++++-
 test/docker/docker-compose.yml |  8 ++++++++
 3 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 test/docker-compose.yml
 create mode 100644 test/docker/docker-compose.yml

(limited to 'test')

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
deleted file mode 100644
index 3acdef7..0000000
--- a/test/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '3'
-services:
-  test:
-    build:
-      context: docker/
-      args:
-        DISTRO: "${DISTRO:-xenial}"
-    volumes:
-      - ../:/src
-    command:
-      - sh
-      - -c
-      - /src/test/local/test.sh && /src/test/linux-home/test.sh
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