From 51e043980e3445179cfec7648b735728e6f519ec Mon Sep 17 00:00:00 2001 From: tcnichol Date: Wed, 10 Feb 2021 13:48:56 -0600 Subject: [PATCH 1/9] adding yml for geoserver and extractors --- docker-compose.geoserver-extractors.yml | 90 +++++++++++++++++++++++++ docker-compose.geoserver.yml | 37 ++++++++++ 2 files changed, 127 insertions(+) create mode 100644 docker-compose.geoserver-extractors.yml create mode 100644 docker-compose.geoserver.yml diff --git a/docker-compose.geoserver-extractors.yml b/docker-compose.geoserver-extractors.yml new file mode 100644 index 000000000..bd0b22112 --- /dev/null +++ b/docker-compose.geoserver-extractors.yml @@ -0,0 +1,90 @@ +version: "3.2" + +services: + + ncsa_geo_shp: + image: clowder/extractors-geoshp-preview:${VERSION:-latest} + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${PROXY_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL} + depends_on: + - geoserver + restart: unless-stopped + deploy: + mode: replicated + replicas: 1 + placement: + constraints: + - node.role == worker + restart_policy: + condition: any + + extractor-geotiff-preview: + image: clowder/extractors-geotiff-preview + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${PROXY_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL} + depends_on: + - geoserver + restart: unless-stopped + deploy: + mode: replicated + replicas: 1 + placement: + constraints: + - node.role == worker + restart_policy: + condition: any + + extractor-geotiff-metadata: + image: clowder/extractors-geotiff-metadata + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${PROXY_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL} + depends_on: + - geoserver + restart: unless-stopped + deploy: + mode: replicated + replicas: 1 + placement: + constraints: + - node.role == worker + restart_policy: + condition: any + +networks: + clowder: \ No newline at end of file diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml new file mode 100644 index 000000000..322f58b60 --- /dev/null +++ b/docker-compose.geoserver.yml @@ -0,0 +1,37 @@ +version: "3.2" + +services: + + geoserver: + image: clowder/geoserver:${VERSION:-latest} + networks: + - clowder +# user: "55242:17027" + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${PROXY_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL} + ports: + - 8080:8080 + volumes: + - /generated/data/mounting:/data_dir + restart: unless-stopped + deploy: + mode: replicated + replicas: 1 + placement: + constraints: + - node.role == manager + restart_policy: + condition: any + +networks: + clowder: \ No newline at end of file From dcd1e3a46ff3478e7bb2b02105d32a155559b826 Mon Sep 17 00:00:00 2001 From: tcnichol Date: Fri, 2 Apr 2021 13:22:07 -0500 Subject: [PATCH 2/9] adding notes about what fields need to be replaced for extractors --- docker-compose.geoserver-extractors.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-compose.geoserver-extractors.yml b/docker-compose.geoserver-extractors.yml index bd0b22112..e185c4286 100644 --- a/docker-compose.geoserver-extractors.yml +++ b/docker-compose.geoserver-extractors.yml @@ -1,7 +1,13 @@ +# +#note - for each extractor, replace the following fields: +# - GEOSERVER_USERNAME +# - GEOSERVER_PASSWORD +# - GEOSERVER_USER +# - replace 'GEOSERVER_URL' with the actual ip or url for the geoserver (not 'localhost') + version: "3.2" services: - ncsa_geo_shp: image: clowder/extractors-geoshp-preview:${VERSION:-latest} networks: From ef0d8ad1867890228cd7953eb7c10dc7158ff870 Mon Sep 17 00:00:00 2001 From: tcnichol Date: Fri, 9 Apr 2021 14:50:53 -0500 Subject: [PATCH 3/9] using TRAEFIK HOST for proxy replacing ip with 'geoserver' --- docker-compose.geoserver-extractors.yml | 36 +++++-------------------- docker-compose.geoserver.yml | 10 +------ 2 files changed, 7 insertions(+), 39 deletions(-) diff --git a/docker-compose.geoserver-extractors.yml b/docker-compose.geoserver-extractors.yml index e185c4286..7806a7484 100644 --- a/docker-compose.geoserver-extractors.yml +++ b/docker-compose.geoserver-extractors.yml @@ -17,24 +17,16 @@ services: - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${PROXY_HOST} + - PROXY_HOST=${TRAEFIK_HOST} - PROXY_URL=${PROXY_URL} - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} depends_on: - geoserver restart: unless-stopped - deploy: - mode: replicated - replicas: 1 - placement: - constraints: - - node.role == worker - restart_policy: - condition: any extractor-geotiff-preview: image: clowder/extractors-geotiff-preview @@ -45,24 +37,16 @@ services: - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${PROXY_HOST} + - PROXY_HOST=${TRAEFIK_HOST} - PROXY_URL=${PROXY_URL} - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} depends_on: - geoserver restart: unless-stopped - deploy: - mode: replicated - replicas: 1 - placement: - constraints: - - node.role == worker - restart_policy: - condition: any extractor-geotiff-metadata: image: clowder/extractors-geotiff-metadata @@ -73,24 +57,16 @@ services: - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${PROXY_HOST} + - PROXY_HOST=${TRAEFIK_HOST} - PROXY_URL=${PROXY_URL} - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} depends_on: - geoserver restart: unless-stopped - deploy: - mode: replicated - replicas: 1 - placement: - constraints: - - node.role == worker - restart_policy: - condition: any networks: clowder: \ No newline at end of file diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml index 322f58b60..5a89ddcc0 100644 --- a/docker-compose.geoserver.yml +++ b/docker-compose.geoserver.yml @@ -12,7 +12,7 @@ services: - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${PROXY_HOST} + - PROXY_HOST=${TRAEFIK_HOST} - PROXY_URL=${PROXY_URL} - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} @@ -24,14 +24,6 @@ services: volumes: - /generated/data/mounting:/data_dir restart: unless-stopped - deploy: - mode: replicated - replicas: 1 - placement: - constraints: - - node.role == manager - restart_policy: - condition: any networks: clowder: \ No newline at end of file From 82663f06da3f7e51fcc90e664d26aedb8264e3f7 Mon Sep 17 00:00:00 2001 From: tcnichol Date: Fri, 7 May 2021 11:06:10 -0500 Subject: [PATCH 4/9] all geoserver in one yml --- docker-compose.geoserver-extractors.yml | 72 ------------------------- docker-compose.geoserver.yml | 60 +++++++++++++++++++++ 2 files changed, 60 insertions(+), 72 deletions(-) delete mode 100644 docker-compose.geoserver-extractors.yml diff --git a/docker-compose.geoserver-extractors.yml b/docker-compose.geoserver-extractors.yml deleted file mode 100644 index 7806a7484..000000000 --- a/docker-compose.geoserver-extractors.yml +++ /dev/null @@ -1,72 +0,0 @@ -# -#note - for each extractor, replace the following fields: -# - GEOSERVER_USERNAME -# - GEOSERVER_PASSWORD -# - GEOSERVER_USER -# - replace 'GEOSERVER_URL' with the actual ip or url for the geoserver (not 'localhost') - -version: "3.2" - -services: - ncsa_geo_shp: - image: clowder/extractors-geoshp-preview:${VERSION:-latest} - networks: - - clowder - environment: - - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} - - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${TRAEFIK_HOST} - - PROXY_URL=${PROXY_URL} - - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} - depends_on: - - geoserver - restart: unless-stopped - - extractor-geotiff-preview: - image: clowder/extractors-geotiff-preview - networks: - - clowder - environment: - - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} - - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${TRAEFIK_HOST} - - PROXY_URL=${PROXY_URL} - - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} - depends_on: - - geoserver - restart: unless-stopped - - extractor-geotiff-metadata: - image: clowder/extractors-geotiff-metadata - networks: - - clowder - environment: - - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} - - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${TRAEFIK_HOST} - - PROXY_URL=${PROXY_URL} - - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} - depends_on: - - geoserver - restart: unless-stopped - -networks: - clowder: \ No newline at end of file diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml index 5a89ddcc0..2448460fc 100644 --- a/docker-compose.geoserver.yml +++ b/docker-compose.geoserver.yml @@ -25,5 +25,65 @@ services: - /generated/data/mounting:/data_dir restart: unless-stopped + ncsa_geo_shp: + image: clowder/extractors-geoshp-preview:${VERSION:-latest} + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${TRAEFIK_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} + depends_on: + - geoserver + restart: unless-stopped + + extractor-geotiff-preview: + image: clowder/extractors-geotiff-preview + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${TRAEFIK_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} + depends_on: + - geoserver + restart: unless-stopped + + extractor-geotiff-metadata: + image: clowder/extractors-geotiff-metadata + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${TRAEFIK_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} + depends_on: + - geoserver + restart: unless-stopped + networks: clowder: \ No newline at end of file From 1c6a289ebaa8e69b7c8058127e914d62b64e5268 Mon Sep 17 00:00:00 2001 From: toddn Date: Tue, 3 Aug 2021 13:08:53 -0500 Subject: [PATCH 5/9] fixing indents --- docker-compose.geoserver.yml | 46 ++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml index 2448460fc..882319891 100644 --- a/docker-compose.geoserver.yml +++ b/docker-compose.geoserver.yml @@ -25,28 +25,32 @@ services: - /generated/data/mounting:/data_dir restart: unless-stopped - ncsa_geo_shp: - image: clowder/extractors-geoshp-preview:${VERSION:-latest} - networks: - - clowder - environment: - - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} - - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${TRAEFIK_HOST} - - PROXY_URL=${PROXY_URL} - - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} - depends_on: - - geoserver - restart: unless-stopped + + + ncsa_geo_shp: + image: clowder/extractors-geoshp-preview:latest + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${TRAEFIK_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} + depends_on: + - geoserver + - rabbitmq + - clowder + restart: unless-stopped extractor-geotiff-preview: - image: clowder/extractors-geotiff-preview + image: clowder/extractors-geotiff-previews:${VERSION:-latest} networks: - clowder environment: @@ -66,7 +70,7 @@ services: restart: unless-stopped extractor-geotiff-metadata: - image: clowder/extractors-geotiff-metadata + image: clowder/extractors-geotiff-metadata:${VERSION:-latest} networks: - clowder environment: From 40664db67ac078be8499829055bafec242c106dc Mon Sep 17 00:00:00 2001 From: toddn Date: Tue, 3 Aug 2021 13:12:18 -0500 Subject: [PATCH 6/9] fixed indents --- docker-compose.geoserver.yml | 76 ++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml index 882319891..60638952f 100644 --- a/docker-compose.geoserver.yml +++ b/docker-compose.geoserver.yml @@ -49,45 +49,45 @@ services: - clowder restart: unless-stopped - extractor-geotiff-preview: - image: clowder/extractors-geotiff-previews:${VERSION:-latest} - networks: - - clowder - environment: - - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} - - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${TRAEFIK_HOST} - - PROXY_URL=${PROXY_URL} - - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} - depends_on: - - geoserver - restart: unless-stopped + extractor-geotiff-preview: + image: clowder/extractors-geotiff-previews:${VERSION:-latest} + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${TRAEFIK_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} + depends_on: + - geoserver + restart: unless-stopped - extractor-geotiff-metadata: - image: clowder/extractors-geotiff-metadata:${VERSION:-latest} - networks: - - clowder - environment: - - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} - - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} - - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} - - PROXY_ON=${PROXY_ON} - - PROXY_HOST=${TRAEFIK_HOST} - - PROXY_URL=${PROXY_URL} - - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} - - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} - - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} - - GEOSERVER_USER=${GEOSERVER_USER:-admin} - - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} - depends_on: - - geoserver - restart: unless-stopped + extractor-geotiff-metadata: + image: clowder/extractors-geotiff-metadata:${VERSION:-latest} + networks: + - clowder + environment: + - RABBITMQ_URI=${RABBITMQ_URI:-amqp://guest:guest@rabbitmq/%2F} + - RABBITMQ_EXCHANGE=${RABBITMQ_EXCHANGE:-clowder} + - REGISTRATION_ENDPOINTS=${REGISTRATION_ENDPOINTS} + - PROXY_ON=${PROXY_ON} + - PROXY_HOST=${TRAEFIK_HOST} + - PROXY_URL=${PROXY_URL} + - GEOSERVER_USERNAME=${GEOSERVER_USERNAME:-admin} + - GEOSERVER_PASSWORD=${GEOSERVER_PASSWORD:-geoserver} + - GEOSERVER_WORKSPACE=${GEOSERVER_WORKSPACE} + - GEOSERVER_USER=${GEOSERVER_USER:-admin} + - GEOSERVER_URL=${GEOSERVER_URL:-http://geoserver:8080} + depends_on: + - geoserver + restart: unless-stopped networks: clowder: \ No newline at end of file From a306fb1ee367d69c1db1c5d4a20e28f819549d19 Mon Sep 17 00:00:00 2001 From: toddn Date: Tue, 3 Aug 2021 13:13:30 -0500 Subject: [PATCH 7/9] fixing latest tag --- docker-compose.geoserver.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml index 60638952f..6b1b382e9 100644 --- a/docker-compose.geoserver.yml +++ b/docker-compose.geoserver.yml @@ -50,7 +50,7 @@ services: restart: unless-stopped extractor-geotiff-preview: - image: clowder/extractors-geotiff-previews:${VERSION:-latest} + image: clowder/extractors-geotiff-previews:latest networks: - clowder environment: @@ -70,7 +70,7 @@ services: restart: unless-stopped extractor-geotiff-metadata: - image: clowder/extractors-geotiff-metadata:${VERSION:-latest} + image: clowder/extractors-geotiff-metadata:latest networks: - clowder environment: From 018a16fcd694af09f7b8cc2f4505f7b7268861cf Mon Sep 17 00:00:00 2001 From: toddn Date: Tue, 3 Aug 2021 13:18:39 -0500 Subject: [PATCH 8/9] fixing name - geotiff preview not previews --- docker-compose.geoserver.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.geoserver.yml b/docker-compose.geoserver.yml index 6b1b382e9..e43fe2564 100644 --- a/docker-compose.geoserver.yml +++ b/docker-compose.geoserver.yml @@ -50,7 +50,7 @@ services: restart: unless-stopped extractor-geotiff-preview: - image: clowder/extractors-geotiff-previews:latest + image: clowder/extractors-geotiff-preview:latest networks: - clowder environment: From e2051a220f4ae9100c630724cad6e79d672a11a6 Mon Sep 17 00:00:00 2001 From: toddn Date: Tue, 10 Aug 2021 12:53:21 -0500 Subject: [PATCH 9/9] adding in env example for geoserver --- env.example | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/env.example b/env.example index ecdce0e5a..a5b1e66ce 100644 --- a/env.example +++ b/env.example @@ -101,3 +101,18 @@ # in case of external rabbitmq, the url to clowder #RABBITMQ_CLOWDERURL=https://clowder-docker.ncsa.illinois.edu/clowder/ + +# ---------------------------------------------------------------------- +# GEOSERVER CONFIGURATION +# ---------------------------------------------------------------------- + +#PROXY_ON=false +#PROXY_URL=http://localhost:9000 + +#GEOSERVER_USERNAME=admin +#GEOSERVER_PASSWORD=geoserver + +#GEOSERVER_WORKSPACE=workspace + +#GEOSERVER_USER=admin +#GEOSERVER_URL=http://localhost:8080