Mercurial > gemma
changeset 2778:7ebd4154894e
Adopt container names to fix GeoServer startup
Since the container name is used as host name, GeoServer failed to
start with version 2.15.0 because of the underscore. Adopted all
container names to avoid similar problems in future and to keep the
names looking consistent.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 22 Mar 2019 13:21:09 +0100 |
| parents | c4821579cfaf |
| children | 21eb85cdfe45 |
| files | client/.env docker/README.md docker/docker-compose.yml example_conf.toml |
| diffstat | 4 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/client/.env Fri Mar 22 13:18:10 2019 +0100 +++ b/client/.env Fri Mar 22 13:21:09 2019 +0100 @@ -3,7 +3,7 @@ #Backend URL VUE_APP_API_URL=/api/ -VUE_BACKEND_API_URL=http://gemma_backend:8000 +VUE_BACKEND_API_URL=http://gemma-backend:8000 #Path of vendored images is copied during a webpack build VUE_APP_VENDOR_IMG_PATH=
--- a/docker/README.md Fri Mar 22 13:18:10 2019 +0100 +++ b/docker/README.md Fri Mar 22 13:21:09 2019 +0100 @@ -100,17 +100,17 @@ Get a running instance with e.g.: ```shell -docker run --name gemma_db -d -p 54321:5432 -v $PWD/schema:/opt/gemma \ +docker run --name gemma-db -d -p 54321:5432 -v $PWD/schema:/opt/gemma \ --network gemma gemma_db ``` -Use `--network-alias gemma_db` if your container has a different name +Use `--network-alias gemma-db` if your container has a different name Run tests for [Row-Level Security](https://www.postgresql.org/docs/11/ddl-rowsecurity.html) (RLS) policies: ```shell -docker exec gemma_db ./run_tests.sh +docker exec gemma-db ./run_tests.sh ``` ### Create ER diagrams @@ -142,11 +142,11 @@ Get a running instance with e.g.: ```shell -docker run --name gemma_geoserver -d -p 8280:8080 --network gemma \ +docker run --name gemma-geoserver -d -p 8280:8080 --network gemma \ gemma_geoserver ``` -Use `--network-alias gemma_geoserver` if you give your container +Use `--network-alias gemma-geoserver` if you give your container a different name. ### Gemma backend setup @@ -160,11 +160,11 @@ Get a running instance with e.g.: ```shell -docker run --name gemma_backend -v $PWD:/opt/gemma -d -p 8200:8000 \ +docker run --name gemma-backend -v $PWD:/opt/gemma -d -p 8200:8000 \ --network gemma gemma_backend ``` -Use `--network-alias gemma_backend` if you give your container +Use `--network-alias gemma-backend` if you give your container a different name. ### SPA setup @@ -178,7 +178,7 @@ Get a running instance with e.g.: ```shell -docker run --name gemma_spa -v $PWD/client:/opt/gemma/client -d -p 8290:8080 \ +docker run --name gemma-spa -v $PWD/client:/opt/gemma/client -d -p 8290:8080 \ --network gemma gemma_spa ```
--- a/docker/docker-compose.yml Fri Mar 22 13:18:10 2019 +0100 +++ b/docker/docker-compose.yml Fri Mar 22 13:21:09 2019 +0100 @@ -11,7 +11,7 @@ version: "3.5" services: gemma_db: - container_name: gemma_db + container_name: gemma-db build: context: ../ dockerfile: docker/Dockerfile.db @@ -23,7 +23,7 @@ ports: - "54321:5432" gemma_geoserver: - container_name: gemma_geoserver + container_name: gemma-geoserver build: context: ../ dockerfile: docker/Dockerfile.geoserv @@ -35,7 +35,7 @@ ports: - "8280:8080" gemma_backend: - container_name: gemma_backend + container_name: gemma-backend build: context: ../ dockerfile: docker/Dockerfile.backend @@ -50,7 +50,7 @@ ports: - "8200:8000" gemma_spa: - container_name: gemma_spa + container_name: gemma-spa build: context: ../ dockerfile: docker/Dockerfile.spa
--- a/example_conf.toml Fri Mar 22 13:18:10 2019 +0100 +++ b/example_conf.toml Fri Mar 22 13:21:09 2019 +0100 @@ -22,7 +22,7 @@ # Database: # DB connection configuration: -db-host = "gemma_db" +db-host = "gemma-db" #db-name = "gemma" #db-port = 5432 #db-ssl = "prefer" @@ -46,7 +46,7 @@ # OGC services setup: # Connection to GeoServer instance for internal OGC services -geoserver-url = "http://gemma_geoserver:8080/geoserver" +geoserver-url = "http://gemma-geoserver:8080/geoserver" #geoserver-user = "admin" #geoserver-password = "geoserver"