From 6caef865f03e980c4bcfab17fb5e4e75ec5994d2 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <terence@tuhinanshu.com>
Date: Fri, 5 Jul 2024 16:59:02 -0400
Subject: [PATCH 1/3] Upgrade Docker image to Ubuntu 16.04

This is necessary to upgrade to the latest
Python 2.7, so we can build images in the
new Docker Image format.
---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5999b88..9b1abfb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 MAINTAINER Azavea <systems@azavea.com>
 
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y \
     libgeos-dev \
     libproj-dev \
     libspatialite-dev \
-    libspatialite5 \
+    libspatialite7 \
     spatialite-bin \
     libibnetdisc-dev \
     wget
@@ -49,4 +49,4 @@ RUN wget -qO- https://github.com/dtarb/TauDEM/archive/v${TAUDEM_VERSION}.tar.gz
 RUN ln -s /usr/src/TauDEM-${TAUDEM_VERSION} /opt/taudem
 ENV PATH /opt/taudem:$PATH
 
-RUN pip install --upgrade pip
+RUN pip install --upgrade "pip<21"

From 91e0b782f4753ebe75b0dc268a718c41ceab27e5 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <terence@tuhinanshu.com>
Date: Thu, 11 Jul 2024 11:29:18 -0400
Subject: [PATCH 2/3] Update README

Remove Travis, update git flow instructions
---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ed53ace..daf06da 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # docker-taudem
 
-[![Travis CI](https://api.travis-ci.org/WikiWatershed/docker-taudem.svg "Build Status on Travis CI")](https://travis-ci.org/WikiWatershed/docker-taudem/)
 [![Docker Repository on Quay.io](https://quay.io/repository/wikiwatershed/taudem/status "Docker Repository on Quay.io")](https://quay.io/repository/wikiwatershed/taudem)
 [![Apache V2 License](http://img.shields.io/badge/license-Apache%20V2-blue.svg)](https://github.com/wikiwatershed/docker-taudem/blob/develop/LICENSE)
 
@@ -23,7 +22,5 @@ $ git flow release start 0.1.0
 $ vim CHANGELOG.md
 $ vim Dockerfile
 $ git commit -m "0.1.0"
-$ git flow release publish 0.1.0
-$ git flow release finish 0.1.0
-$ git push --tags
+$ git flow release finish -p 0.1.0
 ```

From 3f06c6396d11651ea4b3d4f3ed5949e7deb5bd78 Mon Sep 17 00:00:00 2001
From: Terence Tuhinanshu <terence@tuhinanshu.com>
Date: Thu, 11 Jul 2024 12:02:49 -0400
Subject: [PATCH 3/3] Run console non-interactively on CI

---
 scripts/console.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/console.sh b/scripts/console.sh
index ca658d2..415ceb9 100755
--- a/scripts/console.sh
+++ b/scripts/console.sh
@@ -4,4 +4,9 @@ set -ex
 
 ARGS=$*
 
-docker run --rm -ti docker-taudem $ARGS
+if [[ -z $CI ]]; then
+	docker run --rm -ti docker-taudem $ARGS
+else
+	# Run in non-interactive mode in CI
+	docker run --rm docker-taudem $ARGS
+fi