From 5eaf5057d655b94163f649968e2cbdec0ecea3a9 Mon Sep 17 00:00:00 2001
From: emileten <e.tenezakis@gmail.com>
Date: Sat, 11 Nov 2023 19:07:16 +0900
Subject: [PATCH 1/5] add stac browser to docker deployment, change tiler in
 aws deployment to our tiler

---
 docker-compose.custom.yml                     |  9 +++++
 docker-compose.yml                            | 10 +++++
 dockerfiles/Dockerfile.browser                | 34 ++++++++++++++++
 dockerfiles/browser_config.js                 | 39 +++++++++++++++++++
 infrastructure/aws/cdk/app.py                 |  1 +
 infrastructure/aws/cdk/stac_browser_config.js | 39 +++++++++++++++++++
 infrastructure/aws/requirements-cdk.txt       |  2 +-
 7 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 dockerfiles/Dockerfile.browser
 create mode 100644 dockerfiles/browser_config.js
 create mode 100644 infrastructure/aws/cdk/stac_browser_config.js

diff --git a/docker-compose.custom.yml b/docker-compose.custom.yml
index 8e257f1..e1a0b4c 100644
--- a/docker-compose.custom.yml
+++ b/docker-compose.custom.yml
@@ -259,6 +259,15 @@ services:
     volumes:
       - ./.pgdata:/var/lib/postgresql/data
 
+  stac-browser:
+    build:
+      context: dockerfiles
+      dockerfile: Dockerfile.browser
+    ports:
+      - "${MY_DOCKER_IP:-127.0.0.1}:8084:8080"
+    depends_on:
+      - stac
+
 networks:
   default:
     name: eoapi-network
diff --git a/docker-compose.yml b/docker-compose.yml
index a29863d..f7764dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -132,6 +132,16 @@ services:
     volumes:
       - ./.pgdata:/var/lib/postgresql/data
 
+  # change to official image when available https://github.com/radiantearth/stac-browser/pull/386
+  stac-browser:
+    build:
+      context: dockerfiles
+      dockerfile: Dockerfile.browser
+    ports:
+      - "${MY_DOCKER_IP:-127.0.0.1}:8084:8080"
+    depends_on:
+      - stac-fastapi
+
 networks:
   default:
     name: eoapi-network
diff --git a/dockerfiles/Dockerfile.browser b/dockerfiles/Dockerfile.browser
new file mode 100644
index 0000000..f564524
--- /dev/null
+++ b/dockerfiles/Dockerfile.browser
@@ -0,0 +1,34 @@
+# Copyright Radiant Earth Foundation
+
+FROM node:lts-alpine3.18 AS build-step
+ARG DYNAMIC_CONFIG=true
+
+WORKDIR /app
+
+RUN apk add --no-cache git
+RUN git clone https://github.com/radiantearth/stac-browser.git .
+# remove the default config.js
+RUN rm config.js
+RUN npm install
+# replace the default config.js with our config file
+COPY ./browser_config.js ./config.js
+RUN \[ "${DYNAMIC_CONFIG}" == "true" \] && sed -i 's/<!-- <script defer="defer" src=".\/config.js"><\/script> -->/<script defer="defer" src=".\/config.js"><\/script>/g' public/index.html
+RUN npm run build
+
+
+FROM nginx:1-alpine-slim
+
+COPY --from=build-step /app/dist /usr/share/nginx/html
+COPY --from=build-step /app/config.schema.json /etc/nginx/conf.d/config.schema.json
+
+# change default port to 8080
+RUN apk add jq pcre-tools && \
+    sed -i 's/\s*listen\s*80;/    listen 8080;/' /etc/nginx/conf.d/default.conf && \
+    sed -i 's/\s*location \/ {/    location \/ {\n        try_files $uri $uri\/ \/index.html;/' /etc/nginx/conf.d/default.conf
+
+EXPOSE 8080
+
+STOPSIGNAL SIGTERM
+
+# override entrypoint, which calls nginx-entrypoint underneath
+COPY --from=build-step /app/docker/docker-entrypoint.sh ./docker-entrypoint.d/40-stac-browser-entrypoint.sh
\ No newline at end of file
diff --git a/dockerfiles/browser_config.js b/dockerfiles/browser_config.js
new file mode 100644
index 0000000..89844ca
--- /dev/null
+++ b/dockerfiles/browser_config.js
@@ -0,0 +1,39 @@
+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
+};
diff --git a/infrastructure/aws/cdk/app.py b/infrastructure/aws/cdk/app.py
index 7a1bfc9..bbd0a0e 100644
--- a/infrastructure/aws/cdk/app.py
+++ b/infrastructure/aws/cdk/app.py
@@ -272,6 +272,7 @@ def __init__(  # noqa: C901
                     stac_catalog_url=eostac_settings.stac_api_custom_domain_name,
                     website_index_document="index.html",
                     bucket_arn=stac_browser_bucket.bucket_arn,
+                    config_file_path="cdk/stac_browser_config.js",
                 )
 
         # eoapi.vector
diff --git a/infrastructure/aws/cdk/stac_browser_config.js b/infrastructure/aws/cdk/stac_browser_config.js
new file mode 100644
index 0000000..1720e88
--- /dev/null
+++ b/infrastructure/aws/cdk/stac_browser_config.js
@@ -0,0 +1,39 @@
+module.exports = {
+    catalogUrl: null,
+    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}) => "https://raster.eoapi.dev/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
+};
\ No newline at end of file
diff --git a/infrastructure/aws/requirements-cdk.txt b/infrastructure/aws/requirements-cdk.txt
index 1a49cd7..ffa1110 100644
--- a/infrastructure/aws/requirements-cdk.txt
+++ b/infrastructure/aws/requirements-cdk.txt
@@ -7,4 +7,4 @@ boto3==1.28.71
 # pydantic settings
 pydantic~=2.0
 pydantic-settings~=2.0
-eoapi-cdk==6.0.0
\ No newline at end of file
+eoapi-cdk==6.1.2
\ No newline at end of file

From 37ac0576a2767cc660afd0be98c25d4e43f37fef Mon Sep 17 00:00:00 2001
From: emileten <e.tenezakis@gmail.com>
Date: Mon, 13 Nov 2023 16:54:27 +0900
Subject: [PATCH 2/5] fix version

---
 infrastructure/aws/requirements-cdk.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infrastructure/aws/requirements-cdk.txt b/infrastructure/aws/requirements-cdk.txt
index ffa1110..867a9f7 100644
--- a/infrastructure/aws/requirements-cdk.txt
+++ b/infrastructure/aws/requirements-cdk.txt
@@ -7,4 +7,4 @@ boto3==1.28.71
 # pydantic settings
 pydantic~=2.0
 pydantic-settings~=2.0
-eoapi-cdk==6.1.2
\ No newline at end of file
+eoapi-cdk==6.1.0
\ No newline at end of file

From a4bfad432919071ff035555d41edd963a72e2af6 Mon Sep 17 00:00:00 2001
From: emileten <e.tenezakis@gmail.com>
Date: Tue, 14 Nov 2023 17:07:42 +0900
Subject: [PATCH 3/5] fix port

---
 docker-compose.custom.yml      | 2 +-
 docker-compose.yml             | 2 +-
 dockerfiles/Dockerfile.browser | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.custom.yml b/docker-compose.custom.yml
index e1a0b4c..13d9f3e 100644
--- a/docker-compose.custom.yml
+++ b/docker-compose.custom.yml
@@ -264,7 +264,7 @@ services:
       context: dockerfiles
       dockerfile: Dockerfile.browser
     ports:
-      - "${MY_DOCKER_IP:-127.0.0.1}:8084:8080"
+      - "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
     depends_on:
       - stac
 
diff --git a/docker-compose.yml b/docker-compose.yml
index f7764dd..0622d7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -138,7 +138,7 @@ services:
       context: dockerfiles
       dockerfile: Dockerfile.browser
     ports:
-      - "${MY_DOCKER_IP:-127.0.0.1}:8084:8080"
+      - "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
     depends_on:
       - stac-fastapi
 
diff --git a/dockerfiles/Dockerfile.browser b/dockerfiles/Dockerfile.browser
index f564524..0aa9932 100644
--- a/dockerfiles/Dockerfile.browser
+++ b/dockerfiles/Dockerfile.browser
@@ -21,12 +21,12 @@ FROM nginx:1-alpine-slim
 COPY --from=build-step /app/dist /usr/share/nginx/html
 COPY --from=build-step /app/config.schema.json /etc/nginx/conf.d/config.schema.json
 
-# change default port to 8080
+# change default port to 8084
 RUN apk add jq pcre-tools && \
-    sed -i 's/\s*listen\s*80;/    listen 8080;/' /etc/nginx/conf.d/default.conf && \
+    sed -i 's/\s*listen\s*80;/    listen 8084;/' /etc/nginx/conf.d/default.conf && \
     sed -i 's/\s*location \/ {/    location \/ {\n        try_files $uri $uri\/ \/index.html;/' /etc/nginx/conf.d/default.conf
 
-EXPOSE 8080
+EXPOSE 8084
 
 STOPSIGNAL SIGTERM
 

From e5072342335a01951200d89365aae2c069c92dc3 Mon Sep 17 00:00:00 2001
From: emileten <e.tenezakis@gmail.com>
Date: Tue, 14 Nov 2023 17:47:48 +0900
Subject: [PATCH 4/5] create a settings class for browser, remove browser demo
 config and add example instead

---
 infrastructure/aws/cdk/app.py                   | 14 +++++++-------
 ...wser_config.js => browser_config.example.js} |  2 +-
 infrastructure/aws/cdk/config.py                | 17 +++++++++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)
 rename infrastructure/aws/cdk/{stac_browser_config.js => browser_config.example.js} (84%)

diff --git a/infrastructure/aws/cdk/app.py b/infrastructure/aws/cdk/app.py
index bbd0a0e..cf14874 100644
--- a/infrastructure/aws/cdk/app.py
+++ b/infrastructure/aws/cdk/app.py
@@ -16,6 +16,7 @@
     eoAPISettings,
     eoDBSettings,
     eoRasterSettings,
+    eoStacBrowserSettings,
     eoSTACSettings,
     eoVectorSettings,
 )
@@ -242,10 +243,9 @@ def __init__(  # noqa: C901
                 },
             )
 
-            if eostac_settings.stac_api_custom_domain_name is not None:
-                assert (
-                    eostac_settings.stac_browser_github_tag is not None
-                ), "stac_browser_github_tag must be set if stac_api_custom_domain_name is not None."
+            if "browser" in eoapi_settings.functions:
+                eobrowser_settings = eoStacBrowserSettings()
+
                 stac_browser_bucket = s3.Bucket(
                     self,
                     "stac-browser-bucket",
@@ -268,11 +268,11 @@ def __init__(  # noqa: C901
                 StacBrowser(
                     self,
                     "stac-browser",
-                    github_repo_tag=eostac_settings.stac_browser_github_tag,
-                    stac_catalog_url=eostac_settings.stac_api_custom_domain_name,
+                    github_repo_tag=eobrowser_settings.stac_browser_github_tag,
+                    stac_catalog_url=eobrowser_settings.stac_catalog_url,
                     website_index_document="index.html",
                     bucket_arn=stac_browser_bucket.bucket_arn,
-                    config_file_path="cdk/stac_browser_config.js",
+                    config_file_path=eobrowser_settings.config_file_path,
                 )
 
         # eoapi.vector
diff --git a/infrastructure/aws/cdk/stac_browser_config.js b/infrastructure/aws/cdk/browser_config.example.js
similarity index 84%
rename from infrastructure/aws/cdk/stac_browser_config.js
rename to infrastructure/aws/cdk/browser_config.example.js
index 1720e88..6c8f9de 100644
--- a/infrastructure/aws/cdk/stac_browser_config.js
+++ b/infrastructure/aws/cdk/browser_config.example.js
@@ -18,7 +18,7 @@ module.exports = {
     apiCatalogPriority: null,
     useTileLayerAsFallback: true,
     displayGeoTiffByDefault: false,
-    buildTileUrlTemplate: ({href, asset}) => "https://raster.eoapi.dev/cog/tiles/{z}/{x}/{y}@2x?url=" + encodeURIComponent(asset.href.startsWith("/vsi") ? asset.href : href),
+    buildTileUrlTemplate: ({href, asset}) => "https://raster.dev/cog/tiles/{z}/{x}/{y}@2x?url=" + encodeURIComponent(asset.href.startsWith("/vsi") ? asset.href : href),
     stacProxyUrl: null,
     pathPrefix: "/",
     historyMode: "history",
diff --git a/infrastructure/aws/cdk/config.py b/infrastructure/aws/cdk/config.py
index 28cbba4..974c4d1 100644
--- a/infrastructure/aws/cdk/config.py
+++ b/infrastructure/aws/cdk/config.py
@@ -13,6 +13,7 @@ class functionName(str, Enum):
     raster = "raster"
     vector = "vector"
     ingestor = "ingestor"
+    browser = "browser"  # not actually a function, but this keeps things clean.
 
 
 class eoAPISettings(BaseSettings):
@@ -57,10 +58,6 @@ class eoSTACSettings(BaseSettings):
 
     timeout: int = 10
     memory: int = 256
-    stac_browser_github_tag: None | str = "v3.1.0"
-    stac_api_custom_domain_name: None | str = (
-        None  # if not none, will try to deploy a browser with the above tag
-    )
     model_config = {
         "env_prefix": "CDK_EOAPI_STAC_",
         "env_file": ".env",
@@ -115,3 +112,15 @@ class eoVectorSettings(BaseSettings):
         "env_prefix": "CDK_EOAPI_VECTOR_",
         "env_file": ".env",
     }
+
+
+class eoStacBrowserSettings(BaseSettings):
+    """STAC browser settings"""
+
+    stac_browser_github_tag: None | str = "v3.1.0"
+    stac_catalog_url: None | str = None
+    config_file_path: None | str = None
+    model_config = {
+        "env_prefix": "CDK_EOAPI_BROWSER_",
+        "env_file": ".env",
+    }

From 1997b48e00b6c6bba07c2f3ef676a0477c9d3527 Mon Sep 17 00:00:00 2001
From: emileten <e.tenezakis@gmail.com>
Date: Tue, 14 Nov 2023 17:53:22 +0900
Subject: [PATCH 5/5] fix docker compose set up

---
 docker-compose.custom.yml | 21 ++++++++++++---------
 docker-compose.yml        | 23 +++++++++++++----------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/docker-compose.custom.yml b/docker-compose.custom.yml
index 13d9f3e..64343bc 100644
--- a/docker-compose.custom.yml
+++ b/docker-compose.custom.yml
@@ -1,6 +1,18 @@
 version: '3'
 
 services:
+  stac-browser:
+    profiles:
+      - gunicorn
+    build:
+      context: dockerfiles
+      dockerfile: Dockerfile.browser
+    ports:
+      - "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
+    depends_on:
+      - stac
+      - database
+      - raster
   stac:
     container_name: eoapi.stac
     profiles:
@@ -259,15 +271,6 @@ services:
     volumes:
       - ./.pgdata:/var/lib/postgresql/data
 
-  stac-browser:
-    build:
-      context: dockerfiles
-      dockerfile: Dockerfile.browser
-    ports:
-      - "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
-    depends_on:
-      - stac
-
 networks:
   default:
     name: eoapi-network
diff --git a/docker-compose.yml b/docker-compose.yml
index 0622d7f..f43fec0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,19 @@
 version: '3'
 
 services:
+
+  # change to official image when available https://github.com/radiantearth/stac-browser/pull/386
+  stac-browser:
+    build:
+      context: dockerfiles
+      dockerfile: Dockerfile.browser
+    ports:
+      - "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
+    depends_on:
+      - stac-fastapi
+      - titiler-pgstac
+      - database
+      
   stac-fastapi:
     # Note:
     # the official ghcr.io/stac-utils/stac-fastapi-pgstac image uses python 3.8 and uvicorn
@@ -132,16 +145,6 @@ services:
     volumes:
       - ./.pgdata:/var/lib/postgresql/data
 
-  # change to official image when available https://github.com/radiantearth/stac-browser/pull/386
-  stac-browser:
-    build:
-      context: dockerfiles
-      dockerfile: Dockerfile.browser
-    ports:
-      - "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
-    depends_on:
-      - stac-fastapi
-
 networks:
   default:
     name: eoapi-network