diff options
| author | Egor Tensin <egor@tensin.name> | 2026-10-13 00:32:55 +0500 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-10-13 00:32:59 +0500 |
| commit | e231346fdd87520b0cd154aaab8a366f49a9a953 (patch) | |
| tree | b541835914663ddc14a7ffcbd2a285046c362a4a /test/integration/docker/docker-compose.yml | |
| parent | workflows/ci: prettify YAML (diff) | |
| download | cgitize-e231346fdd87520b0cd154aaab8a366f49a9a953.tar.gz cgitize-e231346fdd87520b0cd154aaab8a366f49a9a953.zip | |
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?
Diffstat (limited to 'test/integration/docker/docker-compose.yml')
| -rw-r--r-- | test/integration/docker/docker-compose.yml | 27 |
1 files changed, 14 insertions, 13 deletions
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 |
