From a807b3dcc51e6da5e127d45f74d63edef8020bf6 Mon Sep 17 00:00:00 2001
From: Adrien Perrin <adrien.perrin@nersc.no>
Date: Thu, 11 Apr 2024 14:37:08 +0200
Subject: [PATCH 1/2] use nansat 1.6.1 as base image

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f217633..ca3ddfd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           - '3.10'
           - '3.11'
     env:
-      BASE_IMAGE: "${{ vars.DOCKER_ORG }}/nansat:v1.6.0-python${{ matrix.python_version }}"
+      BASE_IMAGE: "${{ vars.DOCKER_ORG }}/nansat:v1.6.1-python${{ matrix.python_version }}"
       IMAGE_NAME: "${{ vars.DOCKER_ORG }}/geospaas"
       latest: ${{ matrix.python_version == '3.11' && 'true' || '' }}
     steps:

From 304c8100e5bb4d27c7c5093aeecef0173e1f98d4 Mon Sep 17 00:00:00 2001
From: Adrien Perrin <adrien.perrin@nersc.no>
Date: Thu, 11 Apr 2024 14:38:07 +0200
Subject: [PATCH 2/2] use pip instead of setup.py to install geospaas in docker
 image

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

diff --git a/Dockerfile b/Dockerfile
index 8effcd9..ec24960 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@ COPY geospaas /tmp/geospaas
 COPY setup.py /tmp/
 COPY MANIFEST.in /tmp/
 WORKDIR /tmp
-RUN python setup.py install \
+RUN pip install . \
 &&  rm -r geospaas setup.py MANIFEST.in
 
 WORKDIR /src