From d2de73b93bcfdbd75a6162d626a549479bced8ba Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 18 May 2016 00:08:01 +0200 Subject: [PATCH 01/12] Add files via upload --- Dockerfile | 122 ++++++++++++++++++++++++++--------------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/Dockerfile b/Dockerfile index f33fcc2f6a6..b706645ac8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,61 +1,61 @@ -FROM phusion/baseimage:0.9.10 -MAINTAINER Open Knowledge - -# Disable SSH -RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh - -ENV HOME /root -ENV CKAN_HOME /usr/lib/ckan/default -ENV CKAN_CONFIG /etc/ckan/default -ENV CKAN_DATA /var/lib/ckan - -# Install required packages -RUN apt-get -q -y update -RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install \ - python-minimal \ - python-dev \ - python-virtualenv \ - libevent-dev \ - libpq-dev \ - nginx-light \ - apache2 \ - libapache2-mod-wsgi \ - postfix \ - build-essential - -# Install CKAN -RUN virtualenv $CKAN_HOME -RUN mkdir -p $CKAN_HOME $CKAN_CONFIG $CKAN_DATA -RUN chown www-data:www-data $CKAN_DATA - -ADD ./requirements.txt $CKAN_HOME/src/ckan/requirements.txt -RUN $CKAN_HOME/bin/pip install -r $CKAN_HOME/src/ckan/requirements.txt -ADD . $CKAN_HOME/src/ckan/ -RUN $CKAN_HOME/bin/pip install -e $CKAN_HOME/src/ckan/ -RUN ln -s $CKAN_HOME/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini -ADD ./contrib/docker/apache.wsgi $CKAN_CONFIG/apache.wsgi - -# Configure apache -ADD ./contrib/docker/apache.conf /etc/apache2/sites-available/ckan_default.conf -RUN echo "Listen 8080" > /etc/apache2/ports.conf -RUN a2ensite ckan_default -RUN a2dissite 000-default - -# Configure nginx -ADD ./contrib/docker/nginx.conf /etc/nginx/nginx.conf -RUN mkdir /var/cache/nginx - -# Configure postfix -ADD ./contrib/docker/main.cf /etc/postfix/main.cf - -# Configure runit -ADD ./contrib/docker/my_init.d /etc/my_init.d -ADD ./contrib/docker/svc /etc/service -CMD ["/sbin/my_init"] - -# Volumes -VOLUME ["/etc/ckan/default"] -VOLUME ["/var/lib/ckan"] -EXPOSE 80 - -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +FROM phusion/baseimage:latest +MAINTAINER Open Knowledge + +# Disable SSH +RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh + +ENV HOME /root +ENV CKAN_HOME /usr/lib/ckan/default +ENV CKAN_CONFIG /etc/ckan/default +ENV CKAN_DATA /var/lib/ckan + +# Install required packages +RUN apt-get -q -y update +RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install \ + python-minimal \ + python-dev \ + python-virtualenv \ + libevent-dev \ + libpq-dev \ + nginx-light \ + apache2 \ + libapache2-mod-wsgi \ + postfix \ + build-essential + +# Install CKAN +RUN virtualenv $CKAN_HOME +RUN mkdir -p $CKAN_HOME $CKAN_CONFIG $CKAN_DATA +RUN chown www-data:www-data $CKAN_DATA + +ADD ./requirements.txt $CKAN_HOME/src/ckan/requirements.txt +RUN $CKAN_HOME/bin/pip install -r $CKAN_HOME/src/ckan/requirements.txt +ADD . $CKAN_HOME/src/ckan/ +RUN $CKAN_HOME/bin/pip install -e $CKAN_HOME/src/ckan/ +RUN ln -s $CKAN_HOME/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini +ADD ./contrib/docker/apache.wsgi $CKAN_CONFIG/apache.wsgi + +# Configure apache +ADD ./contrib/docker/apache.conf /etc/apache2/sites-available/ckan_default.conf +RUN echo "Listen 8080" > /etc/apache2/ports.conf +RUN a2ensite ckan_default +RUN a2dissite 000-default + +# Configure nginx +ADD ./contrib/docker/nginx.conf /etc/nginx/nginx.conf +RUN mkdir /var/cache/nginx + +# Configure postfix +ADD ./contrib/docker/main.cf /etc/postfix/main.cf + +# Configure runit +ADD ./contrib/docker/my_init.d /etc/my_init.d +ADD ./contrib/docker/svc /etc/service +CMD ["/sbin/my_init"] + +# Volumes +VOLUME ["/etc/ckan/default"] +VOLUME ["/var/lib/ckan"] +EXPOSE 80 + +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* From ba164cae94671291821b549cf5196375cd3b3f6e Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 18 May 2016 00:09:03 +0200 Subject: [PATCH 02/12] Add files via upload --- contrib/docker/solr/Dockerfile | 51 +- contrib/docker/solr/solrconfig.xml | 1482 ++++++++++++++++++++++++++++ 2 files changed, 1510 insertions(+), 23 deletions(-) create mode 100644 contrib/docker/solr/solrconfig.xml diff --git a/contrib/docker/solr/Dockerfile b/contrib/docker/solr/Dockerfile index b702fd72523..d22976494a7 100644 --- a/contrib/docker/solr/Dockerfile +++ b/contrib/docker/solr/Dockerfile @@ -1,23 +1,28 @@ -FROM ubuntu:14.04 -MAINTAINER Open Knowledge - -# Install Java -RUN apt-get -q -y update -RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install default-jre-headless - -# Install Solr -ENV SOLR_HOME /opt/solr/example/solr -ENV SOLR_VERSION 4.8.1 - -RUN mkdir -p /opt/solr -ADD https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz /opt/solr-$SOLR_VERSION.tgz -RUN tar zxf /opt/solr-$SOLR_VERSION.tgz -C /opt/solr --strip-components 1 - -# Install CKAN Solr core -RUN cp -R $SOLR_HOME/collection1/ $SOLR_HOME/ckan/ -RUN echo name=ckan > $SOLR_HOME/ckan/core.properties -ADD https://raw.githubusercontent.com/ckan/ckan/master/ckan/config/solr/schema.xml $SOLR_HOME/ckan/conf/schema.xml - -EXPOSE 8983 -WORKDIR /opt/solr/example -CMD ["java", "-jar", "start.jar"] \ No newline at end of file +FROM solr:latest +MAINTAINER Open Knowledge + +# Enviroment +ENV SOLR_CORE ckan + +# User +USER root + +# Create Directories +RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/conf +RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/data + +# Adding Files +ADD ./solrconfig.xml \ +https://raw.githubusercontent.com/deinok/ckan/master/ckan/config/solr/schema.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/currency.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/protwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \ +/opt/solr/server/solr/$SOLR_CORE/conf/ + +# Create Core.properties +RUN echo name=$SOLR_CORE > /opt/solr/server/solr/$SOLR_CORE/core.properties + +# Giving ownership to Solr +RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE \ No newline at end of file diff --git a/contrib/docker/solr/solrconfig.xml b/contrib/docker/solr/solrconfig.xml new file mode 100644 index 00000000000..2edca08a359 --- /dev/null +++ b/contrib/docker/solr/solrconfig.xml @@ -0,0 +1,1482 @@ + + + + + + + + + 6.0.0 + + + + + + + + + + + + + + + + + + + + ${solr.data.dir:} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${solr.lock.type:native} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${solr.ulog.dir:} + ${solr.ulog.numVersionBuckets:65536} + + + + + ${solr.autoCommit.maxTime:15000} + false + + + + + + ${solr.autoSoftCommit.maxTime:-1} + + + + + + + + + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + 20 + + + 200 + + + + + + + + + + + + + + + + false + + + 2 + + + + + + + + + + + + + + + + + + + + + + + explicit + 10 + + + + + + + + + + + + + + + explicit + json + true + + + + + + + + explicit + + + + + + _text_ + + + + + + add-unknown-fields-to-the-schema + + + + + + + true + ignored_ + _text_ + + + + + + + + + + + + + + explicit + true + + + + + + + + + text_general + + + + + + default + _text_ + solr.DirectSolrSpellChecker + + internal + + 0.5 + + 2 + + 1 + + 5 + + 4 + + 0.01 + + + + + + + + + + + + default + on + true + 10 + 5 + 5 + true + true + 10 + 5 + + + spellcheck + + + + + + + + + + true + + + tvComponent + + + + + + + + + + + + true + false + + + terms + + + + + + + + string + elevate.xml + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + + + 70 + + 0.5 + + [-\w ,/\n\"']{20,200} + + + + + + + ]]> + ]]> + + + + + + + + + + + + + + + + + + + + + + + + ,, + ,, + ,, + ,, + ,]]> + ]]> + + + + + + 10 + .,!? + + + + + + + WORD + + + en + US + + + + + + + + + + + + + + + + + [^\w-\.] + _ + + + + + + + yyyy-MM-dd'T'HH:mm:ss.SSSZ + yyyy-MM-dd'T'HH:mm:ss,SSSZ + yyyy-MM-dd'T'HH:mm:ss.SSS + yyyy-MM-dd'T'HH:mm:ss,SSS + yyyy-MM-dd'T'HH:mm:ssZ + yyyy-MM-dd'T'HH:mm:ss + yyyy-MM-dd'T'HH:mmZ + yyyy-MM-dd'T'HH:mm + yyyy-MM-dd HH:mm:ss.SSSZ + yyyy-MM-dd HH:mm:ss,SSSZ + yyyy-MM-dd HH:mm:ss.SSS + yyyy-MM-dd HH:mm:ss,SSS + yyyy-MM-dd HH:mm:ssZ + yyyy-MM-dd HH:mm:ss + yyyy-MM-dd HH:mmZ + yyyy-MM-dd HH:mm + yyyy-MM-dd + + + + strings + + java.lang.Boolean + booleans + + + java.util.Date + tdates + + + java.lang.Long + java.lang.Integer + tlongs + + + java.lang.Number + tdoubles + + + + + + + + + + + + + + + + + + + + + text/plain; charset=UTF-8 + + + + + ${velocity.template.base.dir:} + ${velocity.solr.resource.loader.enabled:true} + ${velocity.params.resource.loader.enabled:false} + + + + + 5 + + + + + + + + + + + + + + From 148175e8eceea5128d074f2dee541bd89e1ed227 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Thu, 19 May 2016 13:47:35 +0200 Subject: [PATCH 03/12] Update and rename docker-compose.yml to docker-cloud.yml --- contrib/docker/docker-cloud.yml | 11 +++++++++++ contrib/docker/docker-compose.yml | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 contrib/docker/docker-cloud.yml delete mode 100644 contrib/docker/docker-compose.yml diff --git a/contrib/docker/docker-cloud.yml b/contrib/docker/docker-cloud.yml new file mode 100644 index 00000000000..1275dbfa6c1 --- /dev/null +++ b/contrib/docker/docker-cloud.yml @@ -0,0 +1,11 @@ +ckan: + image: ckan/ckan:latest + links: + - db + - solr + ports: + - "80:80" +db: + image: ckan/postgresql:latest +solr: + image: ckan/solr:latest diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml deleted file mode 100644 index 01ecd5aa681..00000000000 --- a/contrib/docker/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -ckan: - image: 'ckan/ckan:latest' - links: - - db - - solr - ports: - - '80:80' -db: - image: 'ckan/postgresql:latest' -solr: - image: 'ckan/solr:latest' From e94b541ac7c56147dbca0a1b260ee7ac1c6a58a4 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Fri, 20 May 2016 10:39:09 +0200 Subject: [PATCH 04/12] Added docker-compose file, easy to install ckan Simplificates the creation of the ckan docker containers required --- contrib/docker/docker-compose.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 contrib/docker/docker-compose.yml diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml new file mode 100644 index 00000000000..e3f602670e0 --- /dev/null +++ b/contrib/docker/docker-compose.yml @@ -0,0 +1,20 @@ + +version: '2' +services: + ckan: + container_name: ckan + image: ckan/ckan:latest + depends_on: + - db + - solr + links: + - db + - solr + ports: + - "80:80" + db: + container_name: db + image: ckan/postgresql:latest + solr: + container_name: solr + image: ckan/solr:latest \ No newline at end of file From dce83b745917a4d50298016b41335035401f68bf Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Fri, 20 May 2016 10:59:12 +0200 Subject: [PATCH 05/12] Fix a small bug --- contrib/docker/solr/solrconfig.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/contrib/docker/solr/solrconfig.xml b/contrib/docker/solr/solrconfig.xml index 2edca08a359..a898aa212f0 100644 --- a/contrib/docker/solr/solrconfig.xml +++ b/contrib/docker/solr/solrconfig.xml @@ -1291,26 +1291,6 @@ yyyy-MM-dd - - strings - - java.lang.Boolean - booleans - - - java.util.Date - tdates - - - java.lang.Long - java.lang.Integer - tlongs - - - java.lang.Number - tdoubles - - From a83fdfca2b639e245bf22257ca57f10def02147c Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 25 May 2016 17:59:52 +0200 Subject: [PATCH 06/12] Postgres 9.5 --- contrib/docker/postgresql/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/postgresql/Dockerfile b/contrib/docker/postgresql/Dockerfile index 2fd05ef813d..30113187281 100644 --- a/contrib/docker/postgresql/Dockerfile +++ b/contrib/docker/postgresql/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:latest +FROM postgres:9.5 MAINTAINER Open Knowledge # Customize default user/pass/db From 18de3abfb81e86c767ea36305320a1833d519c35 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 25 May 2016 18:00:30 +0200 Subject: [PATCH 07/12] Solr 6.0 --- contrib/docker/solr/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/solr/Dockerfile b/contrib/docker/solr/Dockerfile index d22976494a7..505978f9178 100644 --- a/contrib/docker/solr/Dockerfile +++ b/contrib/docker/solr/Dockerfile @@ -1,4 +1,4 @@ -FROM solr:latest +FROM solr:6.0 MAINTAINER Open Knowledge # Enviroment @@ -25,4 +25,4 @@ https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/con RUN echo name=$SOLR_CORE > /opt/solr/server/solr/$SOLR_CORE/core.properties # Giving ownership to Solr -RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE \ No newline at end of file +RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE From 8eb1839a212adf1077386b21c258d3a43d08f451 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 25 May 2016 18:02:22 +0200 Subject: [PATCH 08/12] BaseImage 0.9.15 Probably we should transfer to ubuntu image. This will be on next PR --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b706645ac8d..c4acf1c7ef7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:latest +FROM phusion/baseimage:0.9.15 MAINTAINER Open Knowledge # Disable SSH From dd2859c31faccda8c6aac141dd035058d90c61ac Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 25 May 2016 20:12:45 +0200 Subject: [PATCH 09/12] Fixed Bug in URLs --- contrib/docker/solr/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/docker/solr/Dockerfile b/contrib/docker/solr/Dockerfile index 505978f9178..37ce1b9f3d3 100644 --- a/contrib/docker/solr/Dockerfile +++ b/contrib/docker/solr/Dockerfile @@ -13,12 +13,12 @@ RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/data # Adding Files ADD ./solrconfig.xml \ -https://raw.githubusercontent.com/deinok/ckan/master/ckan/config/solr/schema.xml \ -https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/currency.xml \ -https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/basic_configs/conf/protwords.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/master/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \ +https://raw.githubusercontent.com/ckan/ckan/ckan-2.5.2/ckan/config/solr/schema.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/currency.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/protwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \ /opt/solr/server/solr/$SOLR_CORE/conf/ # Create Core.properties From c5f82f65bec911836eedaccd5b642b325136ff22 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 25 May 2016 20:28:16 +0200 Subject: [PATCH 10/12] Deleted comments, added URL to SolrConfigXml WIKI --- contrib/docker/solr/solrconfig.xml | 1789 ++++++---------------------- 1 file changed, 335 insertions(+), 1454 deletions(-) diff --git a/contrib/docker/solr/solrconfig.xml b/contrib/docker/solr/solrconfig.xml index a898aa212f0..9ac620c2a9d 100644 --- a/contrib/docker/solr/solrconfig.xml +++ b/contrib/docker/solr/solrconfig.xml @@ -1,1462 +1,343 @@ - - - - + - - - - 6.0.0 - - - - - - - - - - - - - - - - - - - - ${solr.data.dir:} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${solr.lock.type:native} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${solr.ulog.dir:} - ${solr.ulog.numVersionBuckets:65536} - - - - - ${solr.autoCommit.maxTime:15000} - false - - - - - - ${solr.autoSoftCommit.maxTime:-1} - - - - - - - - - - - - - - - - 1024 - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - 20 - - - 200 - - - - - - - - - - - - - - - - false - - - 2 - - - - - - - - - - - - - - - - - - - - - - - explicit - 10 - - - - - - - - - - - - - - - explicit - json - true - - - - - - - - explicit - - - - - - _text_ - - - - - - add-unknown-fields-to-the-schema - - - - - - - true - ignored_ - _text_ - - - - - - - - - - - - - - explicit - true - - - - - - - - - text_general - - - - - - default - _text_ - solr.DirectSolrSpellChecker - - internal - - 0.5 - - 2 - - 1 - - 5 - - 4 - - 0.01 - - - - - - - - - - - - default - on - true - 10 - 5 - 5 - true - true - 10 - 5 - - - spellcheck - - - - - - - - - - true - - - tvComponent - - - - - - - - - - - - true - false - - - terms - - - - - - - - string - elevate.xml - - - - - - explicit - - - elevator - - - - - - - - - - - 100 - - - - - - - - 70 - - 0.5 - - [-\w ,/\n\"']{20,200} - - - - - - - ]]> - ]]> - - - - - - - - - - - - - - - - - - - - - - - - ,, + 6.0.0 + + + + + + + + + + + ${solr.data.dir:} + + + + + + + ${solr.lock.type:native} + + + + + + + + ${solr.ulog.dir:} + ${solr.ulog.numVersionBuckets:65536} + + + + ${solr.autoCommit.maxTime:15000} + false + + + + ${solr.autoSoftCommit.maxTime:-1} + + + + + + + 1024 + + + + + true + 20 + 200 + + + + + + + + + + false + 2 + + + + + + + + + + + + + + explicit + 10 + + + + + + + + explicit + json + true + + + + + + + + explicit + + + + + + + + _text_ + + + + + + + + add-unknown-fields-to-the-schema + + + + + + + + true + ignored_ + _text_ + + + + + + + + + + + explicit + true + + + + + + + text_general + + + default + _text_ + solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + + + + + + + + default + on + true + 10 + 5 + 5 + true + true + 10 + 5 + + + + spellcheck + + + + + + + + + + true + + + tvComponent + + + + + + + + + + true + false + + + + terms + + + + + + + string + elevate.xml + + + + + + + explicit + + + elevator + + + + + + + + + + + 100 + + + + + + 70 + 0.5 + [-\w ,/\n\"']{20,200} + + + + + + ]]> + ]]> + + + + + + + + + + + + ,, ,, ,, ,, ,]]> - ]]> - - - - - - 10 - .,!? - - - - - - - WORD - - - en - US - - - - - - - - - - - - - - - - - [^\w-\.] - _ - - - - - - - yyyy-MM-dd'T'HH:mm:ss.SSSZ - yyyy-MM-dd'T'HH:mm:ss,SSSZ - yyyy-MM-dd'T'HH:mm:ss.SSS - yyyy-MM-dd'T'HH:mm:ss,SSS - yyyy-MM-dd'T'HH:mm:ssZ - yyyy-MM-dd'T'HH:mm:ss - yyyy-MM-dd'T'HH:mmZ - yyyy-MM-dd'T'HH:mm - yyyy-MM-dd HH:mm:ss.SSSZ - yyyy-MM-dd HH:mm:ss,SSSZ - yyyy-MM-dd HH:mm:ss.SSS - yyyy-MM-dd HH:mm:ss,SSS - yyyy-MM-dd HH:mm:ssZ - yyyy-MM-dd HH:mm:ss - yyyy-MM-dd HH:mmZ - yyyy-MM-dd HH:mm - yyyy-MM-dd - - - - - - - - - - - - - - - - - - - - - text/plain; charset=UTF-8 - - - - - ${velocity.template.base.dir:} - ${velocity.solr.resource.loader.enabled:true} - ${velocity.params.resource.loader.enabled:false} - - - - - 5 - - - - - - - - - - - - - + ]]> + + + + + + + 10 + .,!? + + + + + + WORD + en + US + + + + + + + + + + + + + + + + [^\w-\.] + _ + + + + + + + yyyy-MM-dd'T'HH:mm:ss.SSSZ + yyyy-MM-dd'T'HH:mm:ss,SSSZ + yyyy-MM-dd'T'HH:mm:ss.SSS + yyyy-MM-dd'T'HH:mm:ss,SSS + yyyy-MM-dd'T'HH:mm:ssZ + yyyy-MM-dd'T'HH:mm:ss + yyyy-MM-dd'T'HH:mmZ + yyyy-MM-dd'T'HH:mm + yyyy-MM-dd HH:mm:ss.SSSZ + yyyy-MM-dd HH:mm:ss,SSSZ + yyyy-MM-dd HH:mm:ss.SSS + yyyy-MM-dd HH:mm:ss,SSS + yyyy-MM-dd HH:mm:ssZ + yyyy-MM-dd HH:mm:ss + yyyy-MM-dd HH:mmZ + yyyy-MM-dd HH:mm + yyyy-MM-dd + + + + + + + text/plain; charset=UTF-8 + + + + ${velocity.template.base.dir:} + ${velocity.solr.resource.loader.enabled:true} + ${velocity.params.resource.loader.enabled:false} + + + + 5 + + From 61d7349cfb48ae28149015c72874877949295e69 Mon Sep 17 00:00:00 2001 From: Raul Hidalgo Caballero Date: Wed, 25 May 2016 20:29:59 +0200 Subject: [PATCH 11/12] Blank Line not required --- contrib/docker/docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml index e3f602670e0..826836066d0 100644 --- a/contrib/docker/docker-compose.yml +++ b/contrib/docker/docker-compose.yml @@ -1,4 +1,3 @@ - version: '2' services: ckan: @@ -17,4 +16,4 @@ services: image: ckan/postgresql:latest solr: container_name: solr - image: ckan/solr:latest \ No newline at end of file + image: ckan/solr:latest From 7a9089a224f73483de4f24cfd18f45b93c6071d9 Mon Sep 17 00:00:00 2001 From: Deinok Date: Thu, 26 May 2016 18:58:51 +0200 Subject: [PATCH 12/12] End of Line - to LF (Unix) All files should be in LF End of Line --- Dockerfile | 122 +++++++++++++++--------------- contrib/docker/docker-compose.yml | 38 +++++----- contrib/docker/solr/Dockerfile | 56 +++++++------- 3 files changed, 108 insertions(+), 108 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4acf1c7ef7..c8d2fe835ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,61 +1,61 @@ -FROM phusion/baseimage:0.9.15 -MAINTAINER Open Knowledge - -# Disable SSH -RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh - -ENV HOME /root -ENV CKAN_HOME /usr/lib/ckan/default -ENV CKAN_CONFIG /etc/ckan/default -ENV CKAN_DATA /var/lib/ckan - -# Install required packages -RUN apt-get -q -y update -RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install \ - python-minimal \ - python-dev \ - python-virtualenv \ - libevent-dev \ - libpq-dev \ - nginx-light \ - apache2 \ - libapache2-mod-wsgi \ - postfix \ - build-essential - -# Install CKAN -RUN virtualenv $CKAN_HOME -RUN mkdir -p $CKAN_HOME $CKAN_CONFIG $CKAN_DATA -RUN chown www-data:www-data $CKAN_DATA - -ADD ./requirements.txt $CKAN_HOME/src/ckan/requirements.txt -RUN $CKAN_HOME/bin/pip install -r $CKAN_HOME/src/ckan/requirements.txt -ADD . $CKAN_HOME/src/ckan/ -RUN $CKAN_HOME/bin/pip install -e $CKAN_HOME/src/ckan/ -RUN ln -s $CKAN_HOME/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini -ADD ./contrib/docker/apache.wsgi $CKAN_CONFIG/apache.wsgi - -# Configure apache -ADD ./contrib/docker/apache.conf /etc/apache2/sites-available/ckan_default.conf -RUN echo "Listen 8080" > /etc/apache2/ports.conf -RUN a2ensite ckan_default -RUN a2dissite 000-default - -# Configure nginx -ADD ./contrib/docker/nginx.conf /etc/nginx/nginx.conf -RUN mkdir /var/cache/nginx - -# Configure postfix -ADD ./contrib/docker/main.cf /etc/postfix/main.cf - -# Configure runit -ADD ./contrib/docker/my_init.d /etc/my_init.d -ADD ./contrib/docker/svc /etc/service -CMD ["/sbin/my_init"] - -# Volumes -VOLUME ["/etc/ckan/default"] -VOLUME ["/var/lib/ckan"] -EXPOSE 80 - -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +FROM phusion/baseimage:0.9.15 +MAINTAINER Open Knowledge + +# Disable SSH +RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh + +ENV HOME /root +ENV CKAN_HOME /usr/lib/ckan/default +ENV CKAN_CONFIG /etc/ckan/default +ENV CKAN_DATA /var/lib/ckan + +# Install required packages +RUN apt-get -q -y update +RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install \ + python-minimal \ + python-dev \ + python-virtualenv \ + libevent-dev \ + libpq-dev \ + nginx-light \ + apache2 \ + libapache2-mod-wsgi \ + postfix \ + build-essential + +# Install CKAN +RUN virtualenv $CKAN_HOME +RUN mkdir -p $CKAN_HOME $CKAN_CONFIG $CKAN_DATA +RUN chown www-data:www-data $CKAN_DATA + +ADD ./requirements.txt $CKAN_HOME/src/ckan/requirements.txt +RUN $CKAN_HOME/bin/pip install -r $CKAN_HOME/src/ckan/requirements.txt +ADD . $CKAN_HOME/src/ckan/ +RUN $CKAN_HOME/bin/pip install -e $CKAN_HOME/src/ckan/ +RUN ln -s $CKAN_HOME/src/ckan/ckan/config/who.ini $CKAN_CONFIG/who.ini +ADD ./contrib/docker/apache.wsgi $CKAN_CONFIG/apache.wsgi + +# Configure apache +ADD ./contrib/docker/apache.conf /etc/apache2/sites-available/ckan_default.conf +RUN echo "Listen 8080" > /etc/apache2/ports.conf +RUN a2ensite ckan_default +RUN a2dissite 000-default + +# Configure nginx +ADD ./contrib/docker/nginx.conf /etc/nginx/nginx.conf +RUN mkdir /var/cache/nginx + +# Configure postfix +ADD ./contrib/docker/main.cf /etc/postfix/main.cf + +# Configure runit +ADD ./contrib/docker/my_init.d /etc/my_init.d +ADD ./contrib/docker/svc /etc/service +CMD ["/sbin/my_init"] + +# Volumes +VOLUME ["/etc/ckan/default"] +VOLUME ["/var/lib/ckan"] +EXPOSE 80 + +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml index 826836066d0..fa722622daa 100644 --- a/contrib/docker/docker-compose.yml +++ b/contrib/docker/docker-compose.yml @@ -1,19 +1,19 @@ -version: '2' -services: - ckan: - container_name: ckan - image: ckan/ckan:latest - depends_on: - - db - - solr - links: - - db - - solr - ports: - - "80:80" - db: - container_name: db - image: ckan/postgresql:latest - solr: - container_name: solr - image: ckan/solr:latest +version: '2' +services: + ckan: + container_name: ckan + image: ckan/ckan:latest + depends_on: + - db + - solr + links: + - db + - solr + ports: + - "80:80" + db: + container_name: db + image: ckan/postgresql:latest + solr: + container_name: solr + image: ckan/solr:latest diff --git a/contrib/docker/solr/Dockerfile b/contrib/docker/solr/Dockerfile index 37ce1b9f3d3..c815b277b3f 100644 --- a/contrib/docker/solr/Dockerfile +++ b/contrib/docker/solr/Dockerfile @@ -1,28 +1,28 @@ -FROM solr:6.0 -MAINTAINER Open Knowledge - -# Enviroment -ENV SOLR_CORE ckan - -# User -USER root - -# Create Directories -RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/conf -RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/data - -# Adding Files -ADD ./solrconfig.xml \ -https://raw.githubusercontent.com/ckan/ckan/ckan-2.5.2/ckan/config/solr/schema.xml \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/currency.xml \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/protwords.txt \ -https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \ -/opt/solr/server/solr/$SOLR_CORE/conf/ - -# Create Core.properties -RUN echo name=$SOLR_CORE > /opt/solr/server/solr/$SOLR_CORE/core.properties - -# Giving ownership to Solr -RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE +FROM solr:6.0 +MAINTAINER Open Knowledge + +# Enviroment +ENV SOLR_CORE ckan + +# User +USER root + +# Create Directories +RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/conf +RUN mkdir -p /opt/solr/server/solr/$SOLR_CORE/data + +# Adding Files +ADD ./solrconfig.xml \ +https://raw.githubusercontent.com/ckan/ckan/ckan-2.5.2/ckan/config/solr/schema.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/currency.xml \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/synonyms.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/stopwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/basic_configs/conf/protwords.txt \ +https://raw.githubusercontent.com/apache/lucene-solr/releases/lucene-solr/6.0.0/solr/server/solr/configsets/data_driven_schema_configs/conf/elevate.xml \ +/opt/solr/server/solr/$SOLR_CORE/conf/ + +# Create Core.properties +RUN echo name=$SOLR_CORE > /opt/solr/server/solr/$SOLR_CORE/core.properties + +# Giving ownership to Solr +RUN chown -R $SOLR_USER:$SOLR_USER /opt/solr/server/solr/$SOLR_CORE