From b00598691f24cc8667cb9d5e10d3326587999af8 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Mon, 23 Oct 2023 11:19:06 +1100 Subject: [PATCH 1/4] Move docker builder back to Ubunutu LTS release. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 239f9ed8..c97431f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.10 as builder +FROM ubuntu:22.04 as builder # Setup build env for postgresql-client-14 USER root From d41b8b31998cef8086375d392351631980c0f00d Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Mon, 23 Oct 2023 11:19:36 +1100 Subject: [PATCH 2/4] Remove orphaned flask-log-request-id package. --- datacube_ows/ogc.py | 8 -------- datacube_ows/startup_utils.py | 3 --- setup.py | 1 - 3 files changed, 12 deletions(-) diff --git a/datacube_ows/ogc.py b/datacube_ows/ogc.py index 1f390419..2b35e2a9 100644 --- a/datacube_ows/ogc.py +++ b/datacube_ows/ogc.py @@ -8,7 +8,6 @@ from time import monotonic from flask import g, render_template, request -from flask_log_request_id import current_request_id from sqlalchemy import text from datacube_ows import __version__ @@ -225,13 +224,6 @@ def legend(layer, style, dates=None): # Flask middleware - -@app.after_request -def append_request_id(response): - response.headers.add("X-REQUEST-ID", current_request_id()) - return response - - @app.before_request def start_timer(): # pylint: disable=assigning-non-slot diff --git a/datacube_ows/startup_utils.py b/datacube_ows/startup_utils.py index 94adcc77..3331baf6 100644 --- a/datacube_ows/startup_utils.py +++ b/datacube_ows/startup_utils.py @@ -12,7 +12,6 @@ from botocore.credentials import RefreshableCredentials from datacube.utils.aws import configure_s3_access from flask import Flask, request -from flask_log_request_id import RequestID, RequestIDLogFilter from rasterio.errors import NotGeoreferencedWarning from datacube_ows.ows_configuration import get_config @@ -33,7 +32,6 @@ def initialise_logger(name=None): handler = logging.StreamHandler() handler.setFormatter(logging.Formatter('[%(asctime)s] [%(levelname)s] %(message)s')) - handler.addFilter(RequestIDLogFilter()) _LOG = logging.getLogger(name) _LOG.addHandler(handler) # If invoked using Gunicorn, link our root logger to the gunicorn logger @@ -181,7 +179,6 @@ def parse_config_file(log=None): def initialise_flask(name): app = Flask(name.split('.')[0]) - RequestID(app) return app def pass_through(undecorated): diff --git a/setup.py b/setup.py index bf853ca6..5f1ba31c 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,6 @@ install_requirements = [ 'datacube[performance,s3]>=1.8.12', 'flask', - 'flask_log_request_id', 'requests', 'affine', 'click', From 7791e13e2bedf54b8369c0d4b10f228efb282c63 Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Mon, 23 Oct 2023 11:36:33 +1100 Subject: [PATCH 3/4] Add config file for readthedocs v2 --- .readthedocs.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .readthedocs.yaml diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 00000000..895dc60b --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,28 @@ +# Read the Docs configuration file for Sphinx projects +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details +# Required +version: 2 + + +# Set the OS, Python version and other tools you might need +build: + os: ubuntu-22.04 + tools: + python: "3.10" + +# Build documentation in the "docs/" directory with Sphinx +sphinx: + configuration: docs/conf.py + + +# Optionally build your docs in additional formats such as PDF and ePub +# formats: +# - pdf +# - epub + +# Optional but recommended, declare the Python requirements required +# to build your documentation +# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html +python: + install: + - requirements: docs/requirements.txt From 81d9bda1f6bb743cc8c53e1f551fe404bfeb3aad Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Mon, 23 Oct 2023 15:51:56 +1100 Subject: [PATCH 4/4] Fix test db build. --- check-code-all.sh | 22 +++++++++++----------- docker/database/Dockerfile | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/check-code-all.sh b/check-code-all.sh index c3cf836c..721b26dc 100755 --- a/check-code-all.sh +++ b/check-code-all.sh @@ -24,24 +24,24 @@ datacube product add https://raw.githubusercontent.com/GeoscienceAustralia/dea-c datacube product add https://raw.githubusercontent.com/GeoscienceAustralia/dea-config/master/products/baseline_satellite_data/geomedian-au/ga_ls8c_nbart_gm_cyear_3.odc-product.yaml # S2 multiproduct datasets -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/07/19/20170719T030622/ga_s2bm_ard_3-2-1_52LGM_2017-07-19_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/07/29/20170729T081630/ga_s2bm_ard_3-2-1_52LGM_2017-07-29_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/08/08/20170818T192649/ga_s2bm_ard_3-2-1_52LGM_2017-08-08_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2am_ard_3/52/LGM/2017/07/14/20170714T082022/ga_s2am_ard_3-2-1_52LGM_2017-07-14_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2am_ard_3/52/LGM/2017/07/24/20170724T030641/ga_s2am_ard_3-2-1_52LGM_2017-07-24_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2am_ard_3/52/LGM/2017/08/03/20170921T103758/ga_s2am_ard_3-2-1_52LGM_2017-08-03_final.odc-metadata.yaml --confirm-ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/07/19/20170719T030622/ga_s2bm_ard_3-2-1_52LGM_2017-07-19_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/07/29/20170729T081630/ga_s2bm_ard_3-2-1_52LGM_2017-07-29_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2bm_ard_3/52/LGM/2017/08/08/20170818T192649/ga_s2bm_ard_3-2-1_52LGM_2017-08-08_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2am_ard_3/52/LGM/2017/07/14/20170714T082022/ga_s2am_ard_3-2-1_52LGM_2017-07-14_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2am_ard_3/52/LGM/2017/07/24/20170724T030641/ga_s2am_ard_3-2-1_52LGM_2017-07-24_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/baseline/ga_s2am_ard_3/52/LGM/2017/08/03/20170921T103758/ga_s2am_ard_3-2-1_52LGM_2017-08-03_final.odc-metadata.yaml --ignore-lineage # flag masking datasets datacube dataset add https://data.dea.ga.gov.au/projects/geodata_coast_100k/v2004/x_15/y_-40/COAST_100K_15_-40.yaml datacube dataset add https://data.dea.ga.gov.au/projects/geodata_coast_100k/v2004/x_8/y_-21/COAST_100K_8_-21.yaml -datacube dataset add https://data.dea.ga.gov.au/derivative/ga_ls_wo_3/1-6-0/094/077/2018/02/08/ga_ls_wo_3_094077_2018-02-08_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://data.dea.ga.gov.au/derivative/ga_ls_fc_3/2-5-1/094/077/2018/02/08/ga_ls_fc_3_094077_2018-02-08_final.odc-metadata.yaml --confirm-ignore-lineage +datacube dataset add https://data.dea.ga.gov.au/derivative/ga_ls_wo_3/1-6-0/094/077/2018/02/08/ga_ls_wo_3_094077_2018-02-08_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://data.dea.ga.gov.au/derivative/ga_ls_fc_3/2-5-1/094/077/2018/02/08/ga_ls_fc_3_094077_2018-02-08_final.odc-metadata.yaml --ignore-lineage # Geomedian datasets -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/derivative/ga_ls8c_nbart_gm_cyear_3/3-0-0/x17/y37/2019--P1Y/ga_ls8c_nbart_gm_cyear_3_x17y37_2019--P1Y_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/derivative/ga_ls8c_nbart_gm_cyear_3/3-0-0/x17/y37/2020--P1Y/ga_ls8c_nbart_gm_cyear_3_x17y37_2020--P1Y_final.odc-metadata.yaml --confirm-ignore-lineage -datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/derivative/ga_ls8c_nbart_gm_cyear_3/3-0-0/x17/y37/2021--P1Y/ga_ls8c_nbart_gm_cyear_3_x17y37_2021--P1Y_final.odc-metadata.yaml --confirm-ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/derivative/ga_ls8c_nbart_gm_cyear_3/3-0-0/x17/y37/2019--P1Y/ga_ls8c_nbart_gm_cyear_3_x17y37_2019--P1Y_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/derivative/ga_ls8c_nbart_gm_cyear_3/3-0-0/x17/y37/2020--P1Y/ga_ls8c_nbart_gm_cyear_3_x17y37_2020--P1Y_final.odc-metadata.yaml --ignore-lineage +datacube dataset add https://dea-public-data.s3.ap-southeast-2.amazonaws.com/derivative/ga_ls8c_nbart_gm_cyear_3/3-0-0/x17/y37/2021--P1Y/ga_ls8c_nbart_gm_cyear_3_x17y37_2021--P1Y_final.odc-metadata.yaml --ignore-lineage # create material view for ranges extents datacube-ows-update --schema --role $DB_USERNAME diff --git a/docker/database/Dockerfile b/docker/database/Dockerfile index cc3af5d2..394e9051 100644 --- a/docker/database/Dockerfile +++ b/docker/database/Dockerfile @@ -1,2 +1,2 @@ -FROM kartoza/postgis:13-3.1 +FROM kartoza/postgis:15 COPY s2_dump.sql /docker-entrypoint-initdb.d/