tests: use a single docker image instead

joaofl · Jan 6, 2025 · 07c8cdd · 07c8cdd
1 parent 8c91784
commit 07c8cdd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/docker/client.dockerfile b/docker/client.dockerfile
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,17 +1,17 @@
 services:
   client:
-    image: client_image:latest
+    image: test_image:latest
     build:
       context: ../
-      dockerfile: docker/client.dockerfile
+      dockerfile: docker/dockerfile
     networks:
       - c_lan
 
   server:
-    image: server_image:latest
+    image: test_image:latest
     build:
       context: ../
-      dockerfile: docker/server.dockerfile
+      dockerfile: docker/dockerfile
     networks:
       c_lan:
         ipv4_address: 172.12.1.4

diff --git a/docker/dockerfile b/docker/dockerfile
@@ -0,0 +1,11 @@
+# FROM debian:bookworm-slim
+FROM ubuntu:latest
+
+RUN apt-get update && \
+    apt-get install -y isc-dhcp-client && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY ./target/debug/quick-serve /usr/local/bin/quick-serve
+
+# Works as a worst case timeout for each test run
+ENTRYPOINT ["/bin/sh", "-c", "sleep 10"]
diff --git a/docker/server.dockerfile b/docker/server.dockerfile