From a050c54dfee9e725f66625e842352c5b2d614592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20H=C3=B8gh?= Date: Thu, 28 Jan 2016 10:26:58 +0100 Subject: [PATCH] no message --- ckan/README.md | 13 +++++++++++++ elasticsearch/Dockerfile | 22 +++++++++++----------- elasticsearch/README.md | 1 + gc2basic/README.md | 1 + gc2core/Dockerfile | 2 +- gc2core/README.md | 1 + geoserver/README.md | 4 +++- kibana/Dockerfile | 2 +- logstash-forwarder/README.md | 2 ++ logstash/Dockerfile | 11 +++++------ mapcache/README.md | 9 +++++++++ postgis/README.md | 1 + solr/README.md | 6 ++++++ 13 files changed, 55 insertions(+), 20 deletions(-) diff --git a/ckan/README.md b/ckan/README.md index e69de29..80f5038 100644 --- a/ckan/README.md +++ b/ckan/README.md @@ -0,0 +1,13 @@ +#CKAN + + sudo docker run \ + --rm -i \ + -v ~:/tmp mapcentia/ckan cp /etc/ckan /tmp -R + + + sudo docker run \ + --name ckan \ + --restart=always \ + -v ~/ckan:/etc/ckan \ + -p 80:80 \ + -d -t mapcentia/ckan \ No newline at end of file diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 92ff49f..add9096 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,23 +1,23 @@ -FROM java:7-jre - -# Install supervisor -RUN apt-get -y update -RUN apt-get -y install supervisor +FROM java:8-jre RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4 # Elasticsearch ENV ELASTICSEARCH_VERSION 1.7.1 -RUN echo "deb http://packages.elasticsearch.org/elasticsearch/${ELASTICSEARCH_VERSION%.*}/debian stable main" > /etc/apt/sources.list.d/elasticsearch.list +ENV ELASTICSEARCH_MAJOR 2.1 +ENV ELASTICSEARCH_VERSION 2.1.1 +ENV ELASTICSEARCH_REPO_BASE http://packages.elasticsearch.org/elasticsearch/2.x/debian + +RUN echo "deb $ELASTICSEARCH_REPO_BASE stable main" > /etc/apt/sources.list.d/elasticsearch.list -RUN apt-get update \ - && apt-get -y install elasticsearch=$ELASTICSEARCH_VERSION \ - && rm -rf /var/lib/apt/lists/* +RUN set -x \ + && apt-get update \ + && apt-get install -y --no-install-recommends elasticsearch=$ELASTICSEARCH_VERSION # Expose port -EXPOSE 9200 +EXPOSE 9200 9300 -VOLUME ["/usr/share/elasticsearch", "/var/lib/elasticsearch/data", "/var/log", "/etc/elasticsearch"] +VOLUME ["/usr/share/elasticsearch/data", "/usr/share/elasticsearch/config"] CMD ["/usr/share/elasticsearch/bin/elasticsearch"] diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 5ff4851..e33ba15 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -6,6 +6,7 @@ Run a container. docker run \ --name elasticsearch \ + --restart=always \ -p 9200:9200 -t -d mapcentia/elasticsearch ![MapCentia](https://geocloud.mapcentia.com/assets/images/MapCentia_geocloud_200.png) diff --git a/gc2basic/README.md b/gc2basic/README.md index 8e06de5..aa0d734 100644 --- a/gc2basic/README.md +++ b/gc2basic/README.md @@ -35,6 +35,7 @@ Start en gc2basic container med navnet "gc2". docker run \ --name gc2 \ + --restart=always \ -p 8080:80 \ -v ~/gc2/conf:/var/www/geocloud2/app/conf \ -v ~/tmp:/var/www/geocloud2/app/tmp \ diff --git a/gc2core/Dockerfile b/gc2core/Dockerfile index a69feac..4efe135 100644 --- a/gc2core/Dockerfile +++ b/gc2core/Dockerfile @@ -109,7 +109,7 @@ RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] # Share dirs -VOLUME ["/var/www/geocloud2", "/var/log", "/etc/apache2", "/usr/share/proj"] +VOLUME ["/var/www/geocloud2", "/var/log", "/etc/apache2", "/usr/share/proj", "/var/spool/cron/crontabs", "/etc/php5/fpm"] # Expose standard ports for HTTP and HTTPS EXPOSE 80 diff --git a/gc2core/README.md b/gc2core/README.md index 95bcd37..424fd86 100644 --- a/gc2core/README.md +++ b/gc2core/README.md @@ -38,6 +38,7 @@ Leave -e TIMEZONE="..." to default to UTC. sudo docker run \ --name gc2core \ + --restart=always \ --link postgis:postgis \ --link elasticsearch:elasticsearch \ --link geoserver:geoserver \ diff --git a/geoserver/README.md b/geoserver/README.md index 6d7aa6a..cfdba43 100644 --- a/geoserver/README.md +++ b/geoserver/README.md @@ -6,7 +6,9 @@ GeoServer 2.7.0 with the printing plug-in running on Oracle Java 7 with native J Just run a container like this: - sudo docker run --name "geoserver" \ + sudo docker run \ + --name "geoserver" \ + --restart=always \ -p 8080:8080 \ -d -t \ mapcentia/geoserver diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 1f21961..d739ef7 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -5,7 +5,7 @@ RUN export DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND noninteractive #Kibana -ENV KIBANA_VERSION 4.1.1 +ENV KIBANA_VERSION 4.3.1 RUN cd /root && curl -L -O https://download.elastic.co/kibana/kibana/kibana-${KIBANA_VERSION}-linux-x64.tar.gz \ && tar xzvf kibana-${KIBANA_VERSION}-linux-x64.tar.gz diff --git a/logstash-forwarder/README.md b/logstash-forwarder/README.md index f3d9426..b3e4697 100644 --- a/logstash-forwarder/README.md +++ b/logstash-forwarder/README.md @@ -14,6 +14,7 @@ Now you can start a Logstash-forwarder container with the host log-folder mounte sudo docker run \ --name logstashforwarder \ + --restart=always \ -v /var/log:/var/log \ -v ~/certs:/certs \ -e "MASTER=example.com:5043" \ @@ -24,6 +25,7 @@ If you are running GC2 in a container called GC2 when do it like this: sudo docker run \ --name logstashforwader \ + --restart=always \ --volumes-from gc2 \ -v ~/certs/:/certs \ -e "MASTER=example.com:5043" \ diff --git a/logstash/Dockerfile b/logstash/Dockerfile index fa9e7e2..ddbd56f 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -7,27 +7,26 @@ RUN apt-get -y install supervisor RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4 # Logstash -ENV LOGSTASH_MAJOR 1.5 -ENV LOGSTASH_VERSION 1:1.5.4-1 +ENV LOGSTASH_MAJOR 2.1 RUN echo "deb http://packages.elasticsearch.org/logstash/${LOGSTASH_MAJOR}/debian stable main" > /etc/apt/sources.list.d/logstash.list RUN set -x \ && apt-get update \ - && apt-get install -y --no-install-recommends logstash=$LOGSTASH_VERSION \ + && apt-get install -y logstash \ && rm -rf /var/lib/apt/lists/* # Elasticsearch -ENV ELASTICSEARCH_VERSION 1.7.1 +ENV ELASTICSEARCH_VERSION 2.1.1 RUN echo "deb http://packages.elasticsearch.org/elasticsearch/${ELASTICSEARCH_VERSION%.*}/debian stable main" > /etc/apt/sources.list.d/elasticsearch.list RUN apt-get update \ - && apt-get -y install elasticsearch=$ELASTICSEARCH_VERSION \ + && apt-get -y install elasticsearch \ && rm -rf /var/lib/apt/lists/* #Kibana -ENV KIBANA_VERSION 4.1.1 +ENV KIBANA_VERSION 4.3.1 RUN cd /root && curl -L -O https://download.elastic.co/kibana/kibana/kibana-${KIBANA_VERSION}-linux-x64.tar.gz \ && tar xzvf kibana-${KIBANA_VERSION}-linux-x64.tar.gz diff --git a/mapcache/README.md b/mapcache/README.md index 5d94dfa..1b9ed36 100644 --- a/mapcache/README.md +++ b/mapcache/README.md @@ -9,6 +9,7 @@ The API is listening to port 1337. sudo docker run \ --name mapcache \ + --restart=always \ -p 8888:80 \ -p 1337:1337 \ --link gc2core:gc2core \ @@ -35,6 +36,14 @@ In app/conf/App.php add: ## Optional MapCache is by default proxied by GC2, which adds a security layer. This adds a small resource overhead. If you want to bypass GC2 security you can add these lines to the Apache2 configuration in the GC2 container. + # Always rewrite GetLegendGraphic, GetFeatureInfo, DescribeFeatureType, format_options and all POST to WMS + RewriteEngine On + RewriteCond %{QUERY_STRING} (^|&)REQUEST=GetLegendGraphic($|&) [NC,OR] + RewriteCond %{QUERY_STRING} (^|&)REQUEST=GetFeatureInfo($|&) [NC,OR] + RewriteCond %{QUERY_STRING} (^|&)REQUEST=DescribeFeatureType($|&) [NC,OR] + RewriteCond %{REQUEST_METHOD} POST + RewriteRule /mapcache/(.*)/wms/(.*) /ows/$1/$2 [L] + ProxyPreserveHost On ProxyPass /mapcache/ http://172.17.42.1:8888/mapcache/ ProxyPassReverse /mapcache/ http://172.17.42.1:8888/mapcache/ diff --git a/postgis/README.md b/postgis/README.md index 058a7a6..daea4b9 100644 --- a/postgis/README.md +++ b/postgis/README.md @@ -10,6 +10,7 @@ Leave -e TIMEZONE="..." to default to UTC and -e LOCALE= to default to en_US.UTF sudo docker run \ --name postgis \ + --restart=always \ -p 5432:5432 \ -e GC2_PASSWORD=xxxxxx \ -e LOCALE=da_DK.UTF-8 \ diff --git a/solr/README.md b/solr/README.md index e69de29..d2c0dd9 100644 --- a/solr/README.md +++ b/solr/README.md @@ -0,0 +1,6 @@ +#Solr + + sudo docker run \ + --name solr \ + -p 8983:8983 \ + -d -t mapcentia/solr \ No newline at end of file