Merge pull request #148 from keitaroinc/2.11-xloader

2.11 xloader and solr fix

Readme.md

@@ -29,10 +29,13 @@ Directory layout:
 ## Running CKAN using docker-compose
 To start CKAN using docker-compose, simply change into the *compose* directory and run
 ```sh
-cd compose/2.9
-docker-compose build
-docker-compose up
+make start
 ```
+This will build the docker images and start the necesaary containers and with
+```sh
+make prune
+```
+the containers are deleted along with the volume
 Check if CKAN was succesfuly started on http://localhost:5000. 
 
 ### Configuration

compose/solr/Dockerfile

@@ -5,6 +5,7 @@ FROM solr:${SOLR_VERSION:-9}
 EXPOSE 8983
 
 ARG CKAN_BRANCH
+RUN echo ${CKAN_BRANCH} | sed 's/\-xloader//g' > /tmp/version
 
 ENV SOLR_CONFIG_DIR="/opt/solr/server/solr/configsets"
 ENV SOLR_SCHEMA_FILE="$SOLR_CONFIG_DIR/ckan/conf/managed-schema"
@@ -15,7 +16,8 @@ USER root
 RUN cp -R $SOLR_CONFIG_DIR/_default $SOLR_CONFIG_DIR/ckan
 
 # Update the schema
-ADD https://raw.githubusercontent.com/ckan/ckan/$CKAN_BRANCH/ckan/config/solr/schema.xml $SOLR_SCHEMA_FILE
+RUN apt install curl -y
+RUN curl https://raw.githubusercontent.com/ckan/ckan/`cat /tmp/version`/ckan/config/solr/schema.xml -o $SOLR_SCHEMA_FILE
 RUN chmod 644 $SOLR_SCHEMA_FILE 
 
 USER solr

images/ckan/2.11/Dockerfile.xloader

@@ -111,7 +111,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 xloader
+ENV CKAN__PLUGINS envvars datastore xloader
 
 # Install necessary packages to run CKAN
 RUN apk add --no-cache \