From e231346fdd87520b0cd154aaab8a366f49a9a953 Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Tue, 13 Oct 2026 00:32:55 +0500
Subject: reshuffle Docker-related files

* The root docker-compose.yml was not used anywhere but the tests, so its
  contents was moved there.
* Some more refactoring and shortening of paths in t/i/docker.
* Removed .dockerignore files - I don't think they're needed, since I
  always use explicit COPY instructions with paths, etc., but I may as
  well be quite wrong on this one.
* Removed examples/docker/ - don't think this one was used at all?
---
 test/integration/docker/docker-compose.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'test/integration/docker/docker-compose.yml')

diff --git a/test/integration/docker/docker-compose.yml b/test/integration/docker/docker-compose.yml
index 703dbd0..75391b8 100644
--- a/test/integration/docker/docker-compose.yml
+++ b/test/integration/docker/docker-compose.yml
@@ -1,21 +1,22 @@
 services:
-  git_server:
-    build:
-      context: .
-      dockerfile: git_server/Dockerfile
   cgitize:
-    extends:
-      file: ../../../docker-compose.yml
-      service: cgitize
+    build:
+      context: ../../..
+      dockerfile: docker/Dockerfile
     environment:
       SCHEDULE: once
     volumes:
-      - ./cgitize/etc:/etc/cgitize:ro
+      - ./etc:/etc/cgitize:ro
       - "$SSH_AUTH_SOCK:/ssh-agent.sock"
-      - ./cgitize/output:/mnt/cgitize
+      - ./output:/mnt/cgitize
   frontend:
-    extends:
-      file: ../../../docker-compose.yml
-      service: frontend
+    build:
+      context: ../../../docker/frontend
+    ports:
+      - '127.0.0.1:80:80'
     volumes:
-      - ./cgitize/output:/mnt/cgitize:ro
+      - ./output:/mnt/cgitize:ro
+  git_server:
+    build:
+      context: .
+      dockerfile: git_server/Dockerfile
-- 
cgit v1.3