Add config for CKAN 2.11

keitaroinc · Aug 21, 2024 · d445972 · d445972
1 parent 89a5e1a
commit d445972
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/compose/2.11/.ckan-env b/compose/2.11/.ckan-env
@@ -15,7 +15,7 @@ CKAN___BEAKER__SESSION__SECRET=CHANGE_ME
 CKAN___API_TOKEN__JWT__ENCODE__SECRET=string:CHANGE_ME
 CKAN___API_TOKEN__JWT__DECODE__SECRET=string:CHANGE_ME
 # CKAN Plugins
-CKAN__PLUGINS=envvars image_view text_view recline_view datastore datapusher
+CKAN__PLUGINS=envvars activity image_view
 # CKAN requires storage path to be set in order for filestore to be enabled
 CKAN__STORAGE_PATH=/srv/app/data
 CKAN__WEBASSETS__PATH=/srv/app/data/webassets
@@ -38,5 +38,5 @@ CKAN__DATAPUSHER__API_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJ6M0l
 # CKAN__DATAPUSHER__API_TOKEN=replace_this_with_api_token_once_ckan_starts
 
 # Solr configuration
-CKAN_VERSION=2.10
+CKAN_VERSION=2.11
 CKAN_CORE_NAME=ckan
diff --git a/compose/2.11/.env b/compose/2.11/.env
@@ -12,7 +12,7 @@ POSTGRES_PORT=5432
 DATASTORE_READONLY_PASSWORD=datastore
 
 # CKAN
-CKAN_VERSION=2.10.4
+CKAN_VERSION=2.11.0
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
@@ -27,6 +27,7 @@ DATAPUSHER_DOWNLOAD_TIMEOUT=30
 DATAPUSHER_SSL_VERIFY=False
 DATAPUSHER_REWRITE_RESOURCES=True
 DATAPUSHER_REWRITE_URL=http://ckan:5005
+DATA_PUSHER_SSL_VERIFY=False
 
 # SOLR
 CKAN_CORE_NAME=ckan

diff --git a/compose/2.11/docker-compose.yml b/compose/2.11/docker-compose.yml
@@ -1,6 +1,4 @@
 # docker-compose build && docker-compose up -d
-version: "3.8"
-
 volumes:
   ckan_data:
   pg_data:

diff --git a/images/ckan/2.11/Dockerfile b/images/ckan/2.11/Dockerfile
@@ -1,14 +1,14 @@
 ##################
 ### Build CKAN ###
 ##################
-FROM alpine:3.17.2 as ckanbuild
+FROM alpine:3.17.2 AS ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.11
+ENV IMAGE_TAG=2.11.0
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.11
+ENV GIT_BRANCH=ckan-2.11.0
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -63,7 +63,7 @@ RUN pip wheel --wheel-dir=/wheels uWSGI==2.0.20 gevent==22.10.2 greenlet==2.0.2
 ###########################
 ### Default-Extensions ####
 ###########################
-FROM alpine:3.17.2 as extbuild
+FROM alpine:3.17.2 AS extbuild
 
 # Set src dirs
 ENV SRC_DIR=/srv/app/src
@@ -74,7 +74,7 @@ ENV DEFAULT_EXTENSIONS envvars
 
 # Locations and tags, please use specific tags or revisions
 ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
-ENV ENVVARS_GIT_BRANCH=0.0.2
+ENV ENVVARS_GIT_BRANCH=v0.0.4
 
 RUN apk add --no-cache \
         python3 \
@@ -106,7 +106,7 @@ ENV CKAN_DIR=${SRC_DIR}/ckan
 ENV DATA_DIR=/srv/app/data
 ENV PIP_SRC=${SRC_DIR}
 ENV CKAN_SITE_URL=http://localhost:5000
-ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher
+ENV CKAN__PLUGINS envvars activity image_view
 
 # Install necessary packages to run CKAN
 RUN apk add --no-cache \
@@ -146,7 +146,7 @@ WORKDIR ${CKAN_DIR}
 
 # Install CKAN
 RUN pip install -e /srv/app/src/ckan && \
-    cp who.ini ${APP_DIR} && \
+    # cp who.ini ${APP_DIR} removed this because there was not in 2.11.0
     pip install --no-index --find-links=/srv/app/wheels -r requirements.txt && \
     # Install default CKAN extensions
     pip install --no-index --find-links=/srv/app/ext_wheels ckanext-envvars && \

diff --git a/images/ckan/2.11/Dockerfile.focal b/images/ckan/2.11/Dockerfile.focal
@@ -4,11 +4,11 @@
 FROM ubuntu:focal-20210827 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.10-focal
+ENV IMAGE_TAG=2.11.0-focal
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git
-ENV GIT_BRANCH=ckan-2.11
+ENV GIT_BRANCH=ckan-2.11.0
 
 # Set timezone
 ENV TZ=UTC
@@ -97,7 +97,7 @@ ENV DEFAULT_EXTENSIONS envvars
 
 # Locations and tags, please use specific tags or revisions
 ENV ENVVARS_GIT_URL=https://github.com/okfn/ckanext-envvars
-ENV ENVVARS_GIT_BRANCH=0.0.1
+ENV ENVVARS_GIT_BRANCH=v0.0.4
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
@@ -152,7 +152,7 @@ ENV CKAN_DIR=${SRC_DIR}/ckan
 ENV DATA_DIR=/srv/app/data
 ENV PIP_SRC=${SRC_DIR}
 ENV CKAN_SITE_URL=http://localhost:5000
-ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher
+ENV CKAN__PLUGINS envvars activity image_view
 
 # Install necessary packages to run CKAN
 RUN apt-get update && \