Merge pull request #106 from opendatacube/bump_odc-tools_versions

Bump version numbers

index/Dockerfile

@@ -1,4 +1,4 @@
-FROM osgeo/gdal:ubuntu-small-3.4.2
+FROM ghcr.io/osgeo/gdal:ubuntu-small-3.7.2
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LC_ALL=C.UTF-8 \
@@ -22,20 +22,12 @@ RUN apt-get update \
         lsb-release \
         # for shapely with --no-binary
         libgeos-dev \
+        postgresql-client-14 \
     # Cleanup
     && apt-get autoclean \
     && apt-get autoremove \
     && rm -rf /var/lib/{apt,dpkg,cache,log}
 
-# Setup PostgreSQL APT repository and install postgresql-client-13
-RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
-RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-RUN apt-get update \
-    && apt-get install -y postgresql-client-13 \
-    && apt-get autoclean \
-    && apt-get autoremove \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}
-
 COPY requirements.txt constraints.txt version.txt /conf/
 
 RUN cat /conf/version.txt \

index/assets/bootstrap-odc.sh

@@ -13,8 +13,16 @@ set -o nounset
 product_catalog=$1
 metadata_catalog=$2
 
-datacube system init --no-default-types --no-init-users
+# Workaround for system init bug
+#PGPASSWORD=$DB_PASSWORD psql -h "$DB_HOSTNAME" -c 'create schema agdc;' -U "$DB_USERNAME" "$DB_DATABASE"
+
+datacube system init --no-default-types
 # Created using : datacube metadata list | awk '{print $1}' | xargs datacube metadata show
+
+# Workaround for system init bug
+#PGPASSWORD=$DB_PASSWORD psql -h "$DB_HOSTNAME" -c 'drop view agdc.dv_eo3_dataset ; drop view agdc.dv_eo_dataset ; drop view agdc.dv_telemetry_dataset ; delete from agdc.metadata_type' -U "$DB_USERNAME" "$DB_DATABASE"
+
+
 datacube metadata add "$metadata_catalog"
 dc-sync-products "$product_catalog"