Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SPEC.md
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ logging:

metadata:
identification:
title: New Mexico Unified Water Data
title: Weaver API - New Mexico Unified Water Data
description: >-
This tool integrates groundwater-level and water-quality data for New Mexico
from state and federal sources, including NMBGMR, USGS, and the Water Quality Portal.
Expand All @@ -398,7 +398,7 @@ metadata:
- NMBGMR
keywords_type: theme
terms_of_service: https://creativecommons.org/licenses/by/4.0/
url: ${PYGEOAPI_SERVER_URL} # the live Cloud Run URL, set in cloudbuild.yaml
url: ${PYGEOAPI_SERVER_URL} # public custom domain, set in cloudbuild.yaml
license:
name: CC-BY 4.0
url: https://creativecommons.org/licenses/by/4.0/
Expand Down Expand Up @@ -625,7 +625,7 @@ Each Cloud Build runs a fresh Docker daemon, so no layer cache serves stale data
build with `--no-cache` to re-download.

Cloud Run Service (`orchestration/pygeoapi/cloudbuild.yaml`):
- `PYGEOAPI_SERVER_URL` — `https://die-pygeoapi-$PROJECT_NUMBER.$_REGION.run.app`
- `PYGEOAPI_SERVER_URL` — `https://weaver-api.newmexicowaterdata.org` (custom domain; pygeoapi builds all links from this)
- `CPL_MACHINE_IS_GCE=YES` — lets GDAL `/vsigs/` use Cloud Run credentials (§6.4); unused
with baked products, kept for images built without them
- Port: 80
Expand Down
2 changes: 1 addition & 1 deletion orchestration/pygeoapi/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ steps:
# CPL_MACHINE_IS_GCE: GDAL can't detect Cloud Run as GCE, so /vsigs/ skips the
# metadata-server credentials and every GeoJSON collection fails without it.
# WSGI_WORKERS=2: the default 4 hit the 2 GiB cap under load locally.
- '--set-env-vars=PYGEOAPI_SERVER_URL=https://die-pygeoapi-$PROJECT_NUMBER.$_REGION.run.app,CPL_MACHINE_IS_GCE=YES,WSGI_WORKERS=2'
- '--set-env-vars=PYGEOAPI_SERVER_URL=https://weaver-api.newmexicowaterdata.org,CPL_MACHINE_IS_GCE=YES,WSGI_WORKERS=2'

substitutions:
_REGION: us-central1
Expand Down
4 changes: 2 additions & 2 deletions orchestration/pygeoapi/config.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ logging:

metadata:
identification:
title: New Mexico Unified Water Data
title: Weaver API - New Mexico Unified Water Data
description: |
<p>This tool integrates groundwater-level and water-quality data for New Mexico
from state and federal sources, including NMBGMR, USGS, and the Water Quality Portal.
Expand Down Expand Up @@ -62,7 +62,7 @@ metadata:
- NMBGMR
keywords_type: theme
terms_of_service: https://creativecommons.org/licenses/by/4.0/
url: ${PYGEOAPI_SERVER_URL} # the live Cloud Run URL, set in cloudbuild.yaml
url: ${PYGEOAPI_SERVER_URL} # public custom domain, set in cloudbuild.yaml
license:
name: CC-BY 4.0
url: https://creativecommons.org/licenses/by/4.0/
Expand Down
Loading