Mercurial > dive4elements > river
diff docker/docker-compose.yml @ 9754:cd07130ded8d 3.2.x
Route GWT client through wiki container
This reduces the need for local configuration changes to get
a working Docker-based setup.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Wed, 12 Oct 2022 10:45:13 +0200 |
| parents | 308a0d822d18 |
| children | 0834c2591e14 |
line wrap: on
line diff
--- a/docker/docker-compose.yml Tue Oct 11 14:02:20 2022 +0200 +++ b/docker/docker-compose.yml Wed Oct 12 10:45:13 2022 +0200 @@ -38,19 +38,6 @@ - artifacts-data:/opt/d4e/bin/artifacts-data ports: - 8081:80 - wiki: - container_name: "d4eriver-wiki" - build: - context: ./ - dockerfile: ./Dockerfile.wiki - image: "d4e/river_wiki" - networks: - - d4e_river - volumes: - - wiki-data:/opt/wiki/moin-1.9.9/wiki/data - - ./wikiconfig_local.py:/opt/wiki/moin-1.9.9/wikiconfig_local.py - ports: - - 8082:80 client: container_name: "d4eriver-client" build: @@ -62,11 +49,23 @@ depends_on: - server - mapserv - - wiki volumes: - ../gwt-client/config:/opt/d4e/river/gwt-client/config + wiki: + container_name: "d4eriver-wiki" + build: + context: ./ + dockerfile: ./Dockerfile.wiki + image: "d4e/river_wiki" + networks: + - d4e_river + depends_on: + - client + volumes: + - wiki-data:/opt/wiki/moin-1.9.9/wiki/data + - ./wikiconfig_local.py:/opt/wiki/moin-1.9.9/wikiconfig_local.py ports: - - 8080:8080 + - 8080:80 networks: d4e_river: name: d4e_river