From 2accaa8bc1c634b471573998364ee98c61326af0 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Fri, 3 May 2024 01:14:24 +0000
Subject: [PATCH 01/14] Bump postgresql client to version 16

---
 index/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 9412334..d424c57 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get update \
         lsb-release \
         # for shapely with --no-binary
         libgeos-dev \
-        postgresql-client-14 \
+        postgresql-client-16 \
     # Cleanup
     && apt-get autoclean \
     && apt-get autoremove \

From 264768e9df2bff939b4cfa7991e13742e2d984ba Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Mon, 13 May 2024 04:35:21 +0000
Subject: [PATCH 02/14] Bump gdal to 3.9.0 (ubuntu 22)

---
 index/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index d424c57..5f39226 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5
+FROM ghcr.io/osgeo/gdal:alpine-small-3.9.0
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LC_ALL=C.UTF-8 \
@@ -23,7 +23,7 @@ RUN apt-get update \
         lsb-release \
         # for shapely with --no-binary
         libgeos-dev \
-        postgresql-client-16 \
+        postgresql-client-16 \        
     # Cleanup
     && apt-get autoclean \
     && apt-get autoremove \

From 93e42df38d55407361c35f483edd825bb76dad27 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Mon, 13 May 2024 05:11:51 +0000
Subject: [PATCH 03/14] Upate to correct base image

---
 index/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 5f39226..444a6c4 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:alpine-small-3.9.0
+FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.0
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LC_ALL=C.UTF-8 \

From 1cdfd0dc9e7213f2c51ad2ca911501cc11d78446 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Mon, 13 May 2024 05:29:03 +0000
Subject: [PATCH 04/14] Confirn versionn of installed pip

---
 index/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index/Dockerfile b/index/Dockerfile
index 444a6c4..31cc6f2 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -32,6 +32,7 @@ RUN apt-get update \
 COPY requirements.txt constraints.txt version.txt /conf/
 
 RUN cat /conf/version.txt \
+  && pip --version \
   && pip install --no-cache-dir --upgrade pip \
   && pip install --no-cache-dir \
     -r /conf/requirements.txt \

From b997cd4c40a73ad602344168b2cbc6abf7c60006 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Tue, 14 May 2024 05:25:24 +0000
Subject: [PATCH 05/14] install virtual environment to run non-os core python

---
 index/Dockerfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 31cc6f2..80c4e59 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -14,8 +14,8 @@ RUN apt-get update \
         unzip \
         # Build tools\
         build-essential \
-        python3-pip \
-        python3-dev \
+        # virtual environment\
+        virtualenv \ 
         # For Psycopg2
         libpq-dev\
         # Yaml parsing speedup, I think
@@ -23,7 +23,12 @@ RUN apt-get update \
         lsb-release \
         # for shapely with --no-binary
         libgeos-dev \
-        postgresql-client-16 \        
+        postgresql-client-16 \
+    && mkdir /virtualenv \
+    && virtualenv /virtualenv/python3.12 \
+    && source /virtualenv/python3.12/bin/activate \
+    && apt-get install -y --no-install-recommends \
+        python3-dev \
     # Cleanup
     && apt-get autoclean \
     && apt-get autoremove \

From 92b01ecf0463aaa68b5412081f87e645f0e15ef0 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Tue, 14 May 2024 05:32:27 +0000
Subject: [PATCH 06/14] Incorrect source path

---
 index/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 80c4e59..6bda68f 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -26,7 +26,7 @@ RUN apt-get update \
         postgresql-client-16 \
     && mkdir /virtualenv \
     && virtualenv /virtualenv/python3.12 \
-    && source /virtualenv/python3.12/bin/activate \
+    && /virtualenv/source /virtualenv/python3.12/bin/activate \
     && apt-get install -y --no-install-recommends \
         python3-dev \
     # Cleanup

From 208a975bf7be4293173d222898e8e81a1ba7904f Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Tue, 14 May 2024 06:34:53 +0000
Subject: [PATCH 07/14] Re-arrange virtual environment installation

---
 index/Dockerfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 6bda68f..6384067 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -7,6 +7,11 @@ ENV DEBIAN_FRONTEND=noninteractive \
 RUN apt-get update \
     && apt-get upgrade -y \
     # Developer convenience
+    && apt-get install -y --no-install-recommends \
+        virtualenv \
+    && mkdir /virtualenv \
+    && virtualenv /virtualenv/python3.12 \
+    && source /virtualenv/python3.12/bin/activate \
     && apt-get install -y --no-install-recommends \
         git \
         fish \
@@ -14,21 +19,15 @@ RUN apt-get update \
         unzip \
         # Build tools\
         build-essential \
-        # virtual environment\
-        virtualenv \ 
+        python3-dev \
         # For Psycopg2
-        libpq-dev\
+        libpq-dev \
         # Yaml parsing speedup, I think
         libyaml-dev \
         lsb-release \
         # for shapely with --no-binary
         libgeos-dev \
         postgresql-client-16 \
-    && mkdir /virtualenv \
-    && virtualenv /virtualenv/python3.12 \
-    && /virtualenv/source /virtualenv/python3.12/bin/activate \
-    && apt-get install -y --no-install-recommends \
-        python3-dev \
     # Cleanup
     && apt-get autoclean \
     && apt-get autoremove \

From c79410ebd7abf78124108aa62d0e602fe24fb53a Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Tue, 14 May 2024 06:57:58 +0000
Subject: [PATCH 08/14] Shell/bash shell script thing

---
 index/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 6384067..56e21fe 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
         virtualenv \
     && mkdir /virtualenv \
     && virtualenv /virtualenv/python3.12 \
-    && source /virtualenv/python3.12/bin/activate \
+    && . /virtualenv/python3.12/bin/activate \
     && apt-get install -y --no-install-recommends \
         git \
         fish \

From 2e36f6f00685d185b4935c71a3f537d093aa22a3 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Tue, 14 May 2024 21:19:17 +0000
Subject: [PATCH 09/14] Python virt env

---
 index/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 56e21fe..b1125da 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -6,12 +6,13 @@ ENV DEBIAN_FRONTEND=noninteractive \
 
 RUN apt-get update \
     && apt-get upgrade -y \
-    # Developer convenience
+    # Python virt environment
     && apt-get install -y --no-install-recommends \
         virtualenv \
     && mkdir /virtualenv \
     && virtualenv /virtualenv/python3.12 \
     && . /virtualenv/python3.12/bin/activate \
+    # Developer convenience
     && apt-get install -y --no-install-recommends \
         git \
         fish \
@@ -36,7 +37,7 @@ RUN apt-get update \
 COPY requirements.txt constraints.txt version.txt /conf/
 
 RUN cat /conf/version.txt \
-  && pip --version \
+  && . /virtualenv/python3.12/bin/activate \
   && pip install --no-cache-dir --upgrade pip \
   && pip install --no-cache-dir \
     -r /conf/requirements.txt \

From 1b3097fa7b38009533a855e288b8608a9a165453 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Tue, 14 May 2024 23:07:52 +0000
Subject: [PATCH 10/14] Perminently set python virtual

---
 index/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index b1125da..b75f1e4 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -34,10 +34,12 @@ RUN apt-get update \
     && apt-get autoremove \
     && rm -rf /var/lib/{apt,dpkg,cache,log}
 
+ENV VIRTUAL_ENV /virtualenv/python3.12
+ENV PATH /virtualenv/python3.12/bin:$PATH
+
 COPY requirements.txt constraints.txt version.txt /conf/
 
 RUN cat /conf/version.txt \
-  && . /virtualenv/python3.12/bin/activate \
   && pip install --no-cache-dir --upgrade pip \
   && pip install --no-cache-dir \
     -r /conf/requirements.txt \

From 3bbb6fb946ddb099fc78e28efde3d7a41aa2595d Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Tue, 14 May 2024 23:17:58 +0000
Subject: [PATCH 11/14] PDowngrade to python 3.11

---
 index/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index b75f1e4..798a13f 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         virtualenv \
     && mkdir /virtualenv \
-    && virtualenv /virtualenv/python3.12 \
-    && . /virtualenv/python3.12/bin/activate \
+    && virtualenv /virtualenv/python3.11 \
+    && . /virtualenv/python3.11/bin/activate \
     # Developer convenience
     && apt-get install -y --no-install-recommends \
         git \
@@ -34,8 +34,8 @@ RUN apt-get update \
     && apt-get autoremove \
     && rm -rf /var/lib/{apt,dpkg,cache,log}
 
-ENV VIRTUAL_ENV /virtualenv/python3.12
-ENV PATH /virtualenv/python3.12/bin:$PATH
+ENV VIRTUAL_ENV /virtualenv/python3.11
+ENV PATH /virtualenv/python3.11/bin:$PATH
 
 COPY requirements.txt constraints.txt version.txt /conf/
 

From 96bce729a56f750a0a0c0b3f00b7a07992589771 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Wed, 15 May 2024 00:17:15 +0000
Subject: [PATCH 12/14] Downgrade to python 3.10

---
 index/Dockerfile  | 8 ++++----
 index/version.txt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 798a13f..3fbf72c 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         virtualenv \
     && mkdir /virtualenv \
-    && virtualenv /virtualenv/python3.11 \
-    && . /virtualenv/python3.11/bin/activate \
+    && virtualenv /virtualenv/python3.10 \
+    && . /virtualenv/python3.10/bin/activate \
     # Developer convenience
     && apt-get install -y --no-install-recommends \
         git \
@@ -34,8 +34,8 @@ RUN apt-get update \
     && apt-get autoremove \
     && rm -rf /var/lib/{apt,dpkg,cache,log}
 
-ENV VIRTUAL_ENV /virtualenv/python3.11
-ENV PATH /virtualenv/python3.11/bin:$PATH
+ENV VIRTUAL_ENV /virtualenv/python3.10
+ENV PATH /virtualenv/python3.10/bin:$PATH
 
 COPY requirements.txt constraints.txt version.txt /conf/
 
diff --git a/index/version.txt b/index/version.txt
index d15723f..1c09c74 100644
--- a/index/version.txt
+++ b/index/version.txt
@@ -1 +1 @@
-0.3.2
+0.3.3

From b0bbda4502e22196df313138ca84e62c6ec3b78f Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Thu, 16 May 2024 04:00:12 +0000
Subject: [PATCH 13/14] Bump odc-apps-dc-tools

---
 index/constraints.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index/constraints.txt b/index/constraints.txt
index dd46c78..720f40b 100644
--- a/index/constraints.txt
+++ b/index/constraints.txt
@@ -205,7 +205,7 @@ numpy==1.26.4
     #   xarray
 odc-apps-cloud==0.2.3
     # via -r requirements.txt
-odc-apps-dc-tools==0.2.16
+odc-apps-dc-tools==0.2.17
     # via -r requirements.txt
 odc-cloud==0.2.5
     # via

From bf7be89daa9e0813190f23a30dce5fbd37cf7c36 Mon Sep 17 00:00:00 2001
From: lars-fillmore <97861771+lars-fillmore@users.noreply.github.com>
Date: Thu, 16 May 2024 04:16:04 +0000
Subject: [PATCH 14/14] Attempt re-running tests as python 3.12

---
 index/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index/Dockerfile b/index/Dockerfile
index 3fbf72c..b75f1e4 100644
--- a/index/Dockerfile
+++ b/index/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         virtualenv \
     && mkdir /virtualenv \
-    && virtualenv /virtualenv/python3.10 \
-    && . /virtualenv/python3.10/bin/activate \
+    && virtualenv /virtualenv/python3.12 \
+    && . /virtualenv/python3.12/bin/activate \
     # Developer convenience
     && apt-get install -y --no-install-recommends \
         git \
@@ -34,8 +34,8 @@ RUN apt-get update \
     && apt-get autoremove \
     && rm -rf /var/lib/{apt,dpkg,cache,log}
 
-ENV VIRTUAL_ENV /virtualenv/python3.10
-ENV PATH /virtualenv/python3.10/bin:$PATH
+ENV VIRTUAL_ENV /virtualenv/python3.12
+ENV PATH /virtualenv/python3.12/bin:$PATH
 
 COPY requirements.txt constraints.txt version.txt /conf/