From 2bd5c5c972ca669f9b040054b230162f4a6eda10 Mon Sep 17 00:00:00 2001
From: Tyler Burton <tyler.burton@gsa.gov>
Date: Mon, 17 Jun 2024 17:06:27 -0500
Subject: [PATCH] update docker image to currently maintained CKAN version; add
 missing sudo to Dockerfile; downgrades Shapely to 1.x version to mitigate
 NumPy issues

---
 Dockerfile         | 5 ++++-
 Makefile           | 2 +-
 README.md          | 4 ++--
 docker-compose.yml | 1 -
 requirements.txt   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4ff20975..66477bd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,10 @@
 ARG CKAN_VERSION=2.10.1
-FROM openknowledge/ckan-dev:${CKAN_VERSION}
+FROM ckan/ckan-dev:${CKAN_VERSION}
 ARG CKAN_VERSION
 
+# add sudo
+RUN set -ex && apk --no-cache add sudo
+
 # Add timezone data
 RUN sudo apk add tzdata proj-util proj-dev geos-dev
 
diff --git a/Makefile b/Makefile
index 2c67d715..7d8e8d6e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CKAN_VERSION ?= 2.10
+CKAN_VERSION ?= 2.10.1
 COMPOSE_FILE ?= docker-compose.yml
 
 build: ## Build the  docker containers
diff --git a/README.md b/README.md
index 741fb422..2bebcbf7 100644
--- a/README.md
+++ b/README.md
@@ -116,10 +116,10 @@ In order to support multiple versions of CKAN, or even upgrade to new versions
 of CKAN, we support development and testing through the `CKAN_VERSION`
 environment variable.
 
-    $ make CKAN_VERSION=2.10 test
+    $ make CKAN_VERSION=2.10.1 test
 
 
 Variable | Description | Default
 -------- | ----------- | -------
-CKAN_VERSION | Version of CKAN to use. | 2.10
+CKAN_VERSION | Version of CKAN to use. | 2.10.1
 COMPOSE_FILE | docker-compose service description file. | docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 15f1ccde..eb585d6b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,4 @@
 ---
-version: "3.7"
 services:
   ckan:
     image: datagov/ckanext-datagovtheme:${CKAN_VERSION} # ensures docker-compose will rebuild the right image in case we change CKAN_VERSION
diff --git a/requirements.txt b/requirements.txt
index 073b2d18..853af4c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,5 +22,5 @@ argparse
 pyparsing>=2.1.10
 requests>=1.1.0
 pyproj
-Shapely==2.0.1
+Shapely==1.8.5
 OWSLib==0.28.1