From fa62c30b11b66ea27a648be4334a0cf6ab9128df Mon Sep 17 00:00:00 2001
From: Blagoja Stojkoski <blagoja.stojkoski@gmail.com>
Date: Thu, 20 May 2021 11:34:55 +0200
Subject: [PATCH] updating s3filestore example to use CKAN 2.9 (#52)

---
 examples/s3filestore/.ckan-env  | 3 ++-
 examples/s3filestore/Dockerfile | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/examples/s3filestore/.ckan-env b/examples/s3filestore/.ckan-env
index 95e1820..b862517 100644
--- a/examples/s3filestore/.ckan-env
+++ b/examples/s3filestore/.ckan-env
@@ -8,7 +8,7 @@ CKAN_SITE_URL=http://localhost:5000
 CKAN_PORT=5000
 CKAN_MAX_UPLOAD_SIZE_MB=10
 # CKAN Plugins
-CKAN__PLUGINS=envvars s3filestore image_view text_view recline_view datastore datapusher
+CKAN__PLUGINS=envvars s3filestore image_view webpage_view text_view recline_view datastore datapusher
 # 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
@@ -16,6 +16,7 @@ CKAN__WEBASSETS__PATH=/srv/app/data/webassets
 CKAN_SYSADMIN_NAME=sysadmin
 CKAN_SYSADMIN_PASSWORD=password
 CKAN_SYSADMIN_EMAIL=sysadmin@ckantest.com
+CKAN__VIEWS__DEFAULT_VIEWS=image_view webpage_view text_view recline_view
 
 # Email settings
 CKAN_SMTP_SERVER=smtp.corporateict.domain:25
diff --git a/examples/s3filestore/Dockerfile b/examples/s3filestore/Dockerfile
index 9470e72..8585521 100644
--- a/examples/s3filestore/Dockerfile
+++ b/examples/s3filestore/Dockerfile
@@ -1,7 +1,7 @@
 ###################
 ### Extensions ####
 ###################
-FROM ghcr.io/keitaroinc/ckan:2.8.8 as extbuild
+FROM ghcr.io/keitaroinc/ckan:2.9.3 as extbuild
 
 # Locations and tags, please use specific tags or revisions
 ENV S3FILESTORE_GIT_URL=https://github.com/keitaroinc/ckanext-s3filestore
@@ -20,11 +20,11 @@ USER ckan
 ############
 ### MAIN ###
 ############
-FROM ghcr.io/keitaroinc/ckan:2.8.8
+FROM ghcr.io/keitaroinc/ckan:2.9.3
 
 LABEL maintainer="Keitaro Inc <info@keitaro.com>"
 
-ENV CKAN__PLUGINS envvars s3filestore image_view text_view recline_view datastore datapusher
+ENV CKAN__PLUGINS envvars s3filestore image_view webpage_view text_view recline_view datastore datapusher
 
 # Switch to the root user
 USER root
@@ -34,7 +34,7 @@ COPY --from=extbuild /wheels /srv/app/ext_wheels
 # Install and enable the custom extensions
 RUN pip install --no-index --find-links=/srv/app/ext_wheels ckanext-s3filestore && \
     pip install --no-index --find-links=/srv/app/ext_wheels -r /srv/app/ext_wheels/s3filestore.txt && \
-    paster --plugin=ckan config-tool "${APP_DIR}/production.ini" "ckan.plugins = ${CKAN__PLUGINS}" && \
+    ckan config-tool "${APP_DIR}/production.ini" "ckan.plugins = ${CKAN__PLUGINS}" && \
     chown -R ckan:ckan /srv/app
 
 # Remove wheels