Merge remote-tracking branch 'origin/15.12'

GFI-Informatique · Apr 5, 2016 · d55c615 · d55c615
2 parents 1a15cd4 + da20e4d
commit d55c615
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 8 deletions.
diff --git a/doc/build.md b/doc/build.md
@@ -79,14 +79,25 @@ data (using a batch insert for instance).
 
 ## Build the modules
 
-Building your SDI is just a command-line away:
+Building your SDI is just few command-lines away.
 ```
 cd ~/georchestra
 export MAVEN_OPTS="-XX:MaxPermSize=512M"
+```
+
+Build Geonetwork
+```
+cd geonetwork
+../mvn -DskipTests clean install
+cd ..
+```
+
+Build **all modules** (except GeoFence).
+```
 ./mvn -Dmaven.test.skip=true -Dserver=myprofile clean install
 ```
 
-Note: this will build **all modules** (except GeoFence).
+
 In case you only want to build one module or a collection, the syntax is a bit different:
 ```
 ./mvn -Dmaven.test.skip=true -Dserver=myprofile -P-all,module1,module2 clean install

diff --git a/extractorapp/src/docker/Dockerfile b/extractorapp/src/docker/Dockerfile
@@ -4,6 +4,12 @@ ADD . /
 
 RUN java -jar "$JETTY_HOME/start.jar" --add-to-startd=jmx,jmx-remote,stats
 
+RUN apt-get update && \
+   apt-get install -y libgdal-java gdal-bin && \
+   rm -rf /var/lib/apt/lists/*
+
+RUN ln -s /usr/share/java/gdal.jar /var/lib/jetty/lib/ext/
+
 VOLUME [ "/var/local/extracts" ]
 
 ENTRYPOINT [ "/docker-entrypoint.sh" ]

diff --git a/geoserver/webapp/pom.xml b/geoserver/webapp/pom.xml
@@ -1042,11 +1042,6 @@
                   <directory>${project.build.directory}</directory>
                   <include>geoserver.war</include>
                 </resource>
-                <resource>
-                  <targetPath>/root</targetPath>
-                  <directory>${project.basedir}/src/docker</directory>
-                  <include>start.sh</include>
-                </resource>
                 <resource>
                   <targetPath>/etc/georchestra</targetPath>
                   <directory>${project.build.directory}/datadir</directory>
@@ -1071,7 +1066,6 @@
         </plugins>
       </build>
     </profile>
-
     <profile>
       <id>geofence</id>
       <properties>

diff --git a/geoserver/webapp/src/docker/Dockerfile b/geoserver/webapp/src/docker/Dockerfile
@@ -4,6 +4,13 @@ RUN apt-get update && \
     apt-get install -y unzip && \
     rm -rf /var/lib/apt/lists/*
 
+RUN echo "deb http://httpredir.debian.org/debian jessie contrib" >> /etc/apt/sources.list
+RUN echo "deb http://security.debian.org/ jessie/updates contrib" >> /etc/apt/sources.list
+
+RUN apt-get update && \
+   apt-get install -y ttf-mscorefonts-installer  && \
+   rm -rf /var/lib/apt/lists/*
+
 ADD . /
 
 VOLUME [ "/var/local/geoserver", "/var/local/geodata", "/var/local/tiles" ]

diff --git a/mapfishapp/src/docker/Dockerfile b/mapfishapp/src/docker/Dockerfile
@@ -4,6 +4,13 @@ ADD . /
 
 RUN java -jar "$JETTY_HOME/start.jar" --add-to-startd=jmx,jmx-remote,stats
 
+RUN apt-get update && \
+   apt-get install -y libgdal-java gdal-bin && \
+   rm -rf /var/lib/apt/lists/*
+
+RUN ln -s /usr/share/java/gdal.jar /var/lib/jetty/lib/ext/
+
+
 VOLUME [ "/var/local/uploads" ]
 
 ENTRYPOINT [ "/docker-entrypoint.sh" ]