Merge pull request #45 from lazaa32/bug_fix_38_and_44

Bug fix 38 and 44

Author: Jorge Samuel Mendes de Jesus

Diff for: .travis.yml

@@ -10,8 +10,8 @@ git:
 install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq gdal-bin libgdal-dev libgdal1h libgdal1-dev libgeos-dev python-dev python3-dev
-  - isolation install GDAL==1.10.0 --global-option=build_ext --global-option="-I/usr/include/gdal"
-  - isolation install -r requirements.txt
+  - pip install GDAL==1.10.0 --global-option=build_ext --global-option="-I/usr/include/gdal"
+  - pip install -r requirements.txt
 
 before_script:
     "python demo.py -d"

Diff for: docker/alpine/flask/Dockerfile

@@ -1,8 +1,8 @@
 FROM alpine:3.6
 MAINTAINER Jorge S. Mendes de Jesus <[email protected]>
 
-ARG GDAL_VERSION=2.2.0
-ARG XERCES_VERSION=3.2.0
+ARG GDAL_VERSION=2.3.2
+ARG XERCES_VERSION=3.2.2
 ARG PROCESSOR_N=4
 
 RUN apk update && apk add --no-cache \
@@ -21,7 +21,8 @@ RUN apk update && apk add --no-cache \
     g++ \
     libstdc++ \
     make \
-    swig  
+    swig
+
 RUN apk add --no-cache \
     --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
     geos \

Diff for: docker/isolation/Dockerfile

@@ -1,10 +1,11 @@
-FROM alpine:latest
+FROM alpine:3.6
 MAINTAINER Jorge S. Mendes de Jesus <[email protected]>
 
-ENV GDAL_VERSION 2.2.0
-ENV XERCES_VERSION 3.2.0
+ARG GDAL_VERSION=2.3.2
+ARG XERCES_VERSION=3.2.2
+ARG PROCESSOR_N=4
 
-RUN apk add --no-cache \
+RUN apk update && apk add --no-cache \
 	git \
 	gcc \
 	bash \
@@ -26,7 +27,7 @@ RUN wget http://www.apache.org/dist/xerces/c/3/sources/xerces-c-${XERCES_VERSION
     tar xvf /tmp/xerces-c-${XERCES_VERSION}.tar.gz -C /tmp && \
     cd /tmp/xerces-c-${XERCES_VERSION} && \
     ./configure --prefix=/opt/xerces && \
-    make -j 4 && \
+    make -j $PROCESSOR_N && \
     make install
 
 # Geos
@@ -40,13 +41,13 @@ RUN wget http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION}.tar
 	tar xzf /tmp/gdal.tar.gz -C /tmp && \
 	cd /tmp/gdal-${GDAL_VERSION} && \
 	CFLAGS="-g -Wall" LDFLAGS="-s" ./configure --with-expat=yes --with-xerces=/opt/xerces --with-geos=yes \
-	&& make -j 4 && make install
+	&& make -j $PROCESSOR_N && make install
 
 RUN cd /tmp/gdal-${GDAL_VERSION}/swig/python \
 	&& python3 setup.py build \
 	&& python3 setup.py install
 
-RUN git clone https://github.com/lazaa32/pywps-flask.git
+RUN git clone https://github.com/geopython/pywps-flask.git
 
 WORKDIR /pywps-flask
 RUN pip3 install -r requirements.txt

Diff for: docker/ubuntu/flask/Dockerfile

@@ -3,7 +3,7 @@ FROM phusion/baseimage:0.9.22
 MAINTAINER Jorge S. Mendes de Jesus <[email protected]>
 
 ARG ROOTDIR=/usr/local/ 
-ARG GDAL_VERSION=2.2.3 
+ARG GDAL_VERSION=2.3.2
 ARG PROCESSOR_N=8
 
 WORKDIR $ROOTDIR/