Merge branch 'update-dockerfile-and-deps' into escape-url-descriptions

GSA · Jun 17, 2024 · e58e436 · e58e436
2 parents 9f8a5fb + 2bd5c5c
commit e58e436
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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