Fix titiler external endpoints (#33)

* Update titiler-pgstac docker image version and enable external endpoints

* Align stac-browser config according to titiler-stac external url

* Bump titiler-pgstac to the last released version


---------

Co-authored-by: Francesco Bartoli <[email protected]>
Co-authored-by: hrodmn <[email protected]>

Author: 3 people

docker-compose.yml

@@ -1,7 +1,6 @@
-version: '3'
+version: "3"
 
 services:
-
   # change to official image when available https://github.com/radiantearth/stac-browser/pull/386
   stac-browser:
     build:
@@ -47,16 +46,15 @@ services:
       - DB_MAX_CONN_SIZE=10
     depends_on:
       - database
-    command:
-      bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
+    command: bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
     volumes:
       - ./dockerfiles/scripts:/tmp/scripts
 
   raster:
     # At the time of writing, rasterio and psycopg wheels are not available for arm64 arch
     # so we force the image to be built with linux/amd64
     platform: linux/amd64
-    image: ghcr.io/stac-utils/titiler-pgstac:1.2.2
+    image: ghcr.io/stac-utils/titiler-pgstac:1.8.0
     ports:
       - "${MY_DOCKER_IP:-127.0.0.1}:8082:8082"
     environment:
@@ -91,13 +89,13 @@ services:
       - VSI_CACHE_SIZE=536870912
       # TiTiler Config
       - MOSAIC_CONCURRENCY=1
+      - TITILER_PGSTAC_API_ENABLE_EXTERNAL_DATASET_ENDPOINTS=True
       # AWS S3 endpoint config
       - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
       - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
     depends_on:
       - database
-    command:
-      bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
+    command: bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && gunicorn -k uvicorn.workers.UvicornWorker titiler.pgstac.main:app --bind 0.0.0.0:8082 --workers 1"
     volumes:
       - ./dockerfiles/scripts:/tmp/scripts
 
@@ -123,8 +121,7 @@ services:
       - POSTGRES_PORT=5432
       - DB_MIN_CONN_SIZE=1
       - DB_MAX_CONN_SIZE=10
-    command:
-      bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
+    command: bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
     depends_on:
       - database
     volumes:

dockerfiles/browser_config.js

@@ -1,39 +1,34 @@
 module.exports = {
-    catalogUrl: "http://0.0.0.0:8081",
-    catalogTitle: "eoAPI STAC Browser",
-    allowExternalAccess: true, // Must be true if catalogUrl is not given
-    allowedDomains: [],
-    detectLocaleFromBrowser: true,
-    storeLocale: true,
-    locale: "en",
-    fallbackLocale: "en",
-    supportedLocales: [
-        "de",
-        "es",
-        "en",
-        "fr",
-        "it",
-        "ro"
-    ],
-    apiCatalogPriority: null,
-    useTileLayerAsFallback: true,
-    displayGeoTiffByDefault: false,
-    buildTileUrlTemplate: ({href, asset}) => "http://0.0.0.0:8082/cog/tiles/{z}/{x}/{y}@2x?url=" + encodeURIComponent(asset.href.startsWith("/vsi") ? asset.href : href),
-    stacProxyUrl: null,
-    pathPrefix: "/",
-    historyMode: "history",
-    cardViewMode: "cards",
-    cardViewSort: "asc",
-    showThumbnailsAsAssets: false,
-    stacLint: true,
-    geoTiffResolution: 128,
-    redirectLegacyUrls: false,
-    itemsPerPage: 12,
-    defaultThumbnailSize: null,
-    maxPreviewsOnMap: 50,
-    crossOriginMedia: null,
-    requestHeaders: {},
-    requestQueryParameters: {},
-    preprocessSTAC: null,
-    authConfig: null
+  catalogUrl: "http://localhost:8081",
+  catalogTitle: "eoAPI STAC Browser",
+  allowExternalAccess: true, // Must be true if catalogUrl is not given
+  allowedDomains: [],
+  detectLocaleFromBrowser: true,
+  storeLocale: true,
+  locale: "en",
+  fallbackLocale: "en",
+  supportedLocales: ["de", "es", "en", "fr", "it", "ro"],
+  apiCatalogPriority: null,
+  useTileLayerAsFallback: false,
+  displayGeoTiffByDefault: false,
+  buildTileUrlTemplate: ({ href, asset }) =>
+    "http://localhost:8082/external/tiles/WebMercatorQuad/{z}/{x}/{y}@2x?url=" +
+    encodeURIComponent(asset.href.startsWith("/vsi") ? asset.href : href),
+  stacProxyUrl: null,
+  pathPrefix: "/",
+  historyMode: "history",
+  cardViewMode: "cards",
+  cardViewSort: "asc",
+  showThumbnailsAsAssets: false,
+  stacLint: true,
+  geoTiffResolution: 128,
+  redirectLegacyUrls: false,
+  itemsPerPage: 12,
+  defaultThumbnailSize: null,
+  maxPreviewsOnMap: 50,
+  crossOriginMedia: null,
+  requestHeaders: {},
+  requestQueryParameters: {},
+  preprocessSTAC: null,
+  authConfig: null,
 };