Dockerfile

@@ -5,6 +5,9 @@ MAINTAINER Vaclav Petras <wenzeslaus@gmail.com>
 # system environment
 ENV DEBIAN_FRONTEND noninteractive
 
+# data directory - not using the base images volume because then the permissions cannot be adapted
+ENV DATA_DIR /data
+
 # GRASS GIS compile dependencies
 RUN apt-get update \
     && apt-get install -y --install-recommends \
@@ -45,7 +48,8 @@ RUN apt-get update \
         unixodbc-dev \
         zlib1g-dev \
     && apt-get autoremove \
-    && apt-get clean
+    && apt-get clean && \
+    mkdir -p $DATA_DIR
 
 RUN mkdir /code
 RUN mkdir /code/grass
@@ -70,17 +74,22 @@ RUN ./configure \
     --with-freetype=yes --with-freetype-includes="/usr/include/freetype2/" \
     --with-sqlite=yes \
     --with-liblas=yes --with-liblas-config=/usr/bin/liblas-config \
-    && make && make install && ldconfig
+    && make -j2 && make install && ldconfig
 
 # enable simple grass command regardless of version number
 RUN ln -s /usr/local/bin/grass* /usr/local/bin/grass
 
+# Fix permissions
+RUN chmod -R a+rwx $DATA_DIR
+
 # create a user
 RUN useradd -m -U grass
 
-VOLUME ["/data"]
+# declare volume late so permissions apply
+VOLUME $DATA_DIR
+WORKDIR $DATA_DIR
 
 # switch the user
 USER grass
 
-WORKDIR /data
+CMD ["/usr/local/bin/grass", "--version"]

INSTALL

@@ -33,7 +33,7 @@ Installation order:
 	1. PROJ4
 	2. GDAL-OGR  (compiled without GRASS support)
         3. optionally: databases such as PostgreSQL, MySQL, sqlite
-	4. GRASS
+	4. GRASS GIS
         5. optionally: GDAL-OGR-GRASS plugin
 
 (A) SOURCE CODE DISTRIBUTION
@@ -314,6 +314,6 @@ https://trac.osgeo.org/grass/wiki/Submitting
 https://grass.osgeo.org/documentation/first-time-users/
 
 ------------------
-(C) 1999-2017 by The GRASS Development Team
+(C) 1999-2018 by The GRASS Development Team
 
-Last changed: $Date: 2017-11-12 20:37:57 +0100 (Sun, 12 Nov 2017) $
+Last changed: $Date: 2018-01-01 23:36:04 +0100 (Mon, 01 Jan 2018) $

README

@@ -55,19 +55,32 @@ http://grass.osgeo.org/programming7/
 Build using the downloaded source code (in the directory with the
 source code):
 
-    docker build -t grass .
+    docker build -t grassgis74 .
 
-A test run (assuming you have existing GRASS GIS location)
+A test run (assuming you have existing GRASS GIS location; it can be downloaded from
+https://grass.osgeo.org/sampledata/north_carolina/nc_basic_spm_grass7.zip)
 
-    docker run --rm -v /your/local/grassdata/:/data -it grass \
+    # case 1: launching in the grassdata directory in which the location is stored:
+    docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data --env HOME=/data/ grassgis74 \
+        grass --text nc_basic_spm/PERMANENT --exec g.region -p
+
+    # case 2: launching anywhere
+    docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis74 \
         grass /data/nc_basic_spm/PERMANENT --exec g.region -p
 
-Note that the first `grass` is a name of the image while the second
+Note that the first `grassgis74` is the name of the image while the second
 `grass` is the name of the executable.
 
 To run the tests (again assuming local location):
 
-    docker run --rm -v /your/test/grassdata/:/data -w /code/grass \
-        -it grass grass /data/nc_basic_spm/PERMANENT --exec \
+    docker run -it --rm --user=$(id -u):$(id -g) --volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \
+        grassgis74 grass /data/nc_basic_spm/PERMANENT --exec \
             python -m grass.gunittest.main \
                 --location nc_basic_spm --location-type nc
+
+Note: If you compiled locally before building the Docker image, you may
+encounter problems as the local configuration and locally compiled file
+are copied to and used in the Docker image. To make sure you don't have
+this issue, clean all the compiled files from the source code:
+
+    make distclean

REQUIREMENTS.html

@@ -212,11 +212,11 @@ MacOSX users may go here to download precompiled libraries etc.:
 <p>
 
 <hr width="100%">
-<i>&copy; GRASS Development Team 1997-2017</i>
+<i>&copy; GRASS Development Team 1997-2018</i>
 <p>Please report bugs here:
-<br><a href="http://grass.osgeo.org/development/bug-tracking/">http://grass.osgeo.org/development/bug-tracking/</a>
+<br><a href="https://grass.osgeo.org/development/bug-tracking/">https://grass.osgeo.org/development/bug-tracking/</a>
 
 <p>
-<i>Last changed: $Date: 2017-01-01 20:47:30 +0100 (Sun, 01 Jan 2017) $</i>
+<i>Last changed: $Date: 2018-01-01 23:36:04 +0100 (Mon, 01 Jan 2018) $</i>
 </body>
 </html>

configure.in

@@ -850,6 +850,7 @@ else
   LIBS="$LIBS $LIBLAS_LIBS"
   CFLAGS="$CFLAGS $LIBLAS_CFLAGS"
   CPPFLAGS="$CPPFLAGS $LIBLAS_INC"
+  AC_CHECK_HEADERS(liblas/capi/liblas.h)
   AC_TRY_LINK([#include <liblas/capi/liblas.h>],[LASReader_Create("foo");],,[
   AC_TRY_LINK([#include <liblas/capi/liblas.h>],[LASReader_Create("foo");],LAS_LIBS="$LAS_LIBS",[
   AC_MSG_ERROR([*** Unable to locate libLAS library.])

debian/changelog

+grass (7.4.0~rc2-1~exp1~xenial1) xenial; urgency=medium
+
+  * Rebuild for xenial.
+
+ -- Martin Landa <landa.martin@gmail.com>  Thu, 11 Jan 2018 14:29:12 +0100
+
+grass (7.4.0~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Add overrides for dependency-on-python-version-marked-for-end-of-life.
+  * Bump Standards-Version to 4.1.3, no changes.
+  * Update copyright years for copyright holders.
+  * Drop patches applied upstream.
+  * Add patch to fix spelling errors.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 09 Jan 2018 08:41:24 +0100
+
 grass (7.4.0~rc1-1~exp1~xenial1) xenial; urgency=medium
 
   * Rebuild for xenial.

debian/control

@@ -49,7 +49,7 @@ Build-Depends: autoconf2.13,
                python-wxgtk3.0,
                unixodbc-dev,
                zlib1g-dev
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git -b ubuntugis/xenial
 Homepage: http://grass.osgeo.org/

debian/copyright

@@ -4,10 +4,11 @@ Upstream-Contact: GRASS Development Team <grass-dev@lists.osgeo.org>
 Source: http://grass.osgeo.org/
 
 Files: *
-Copyright:   1989-2017, GRASS Development Team
+Copyright:   1989-2018, GRASS Development Team
              1992-2017, Helena Mitasova
              2003-2017, Glynn Clements
              2011-2017, Markus Metz
+             2011-2017, Soeren Gebbert
              2011-2017, Vaclav Petras
  2012, 2014-2015, 2017, Luca Delucchi
                   2017, Maris Nartiss
@@ -25,7 +26,6 @@ Copyright:   1989-2017, GRASS Development Team
              2003-2014, Per Henrik Johansen
              2006-2014, Hamish Bowman
              2007-2014, Lars Ahlzen
-             2011-2014, Soeren Gebbert
              2011-2013, Anna Kratochvilova
                   2013, GKX Associates Inc.
        2009-2010, 2012, Daniel Bundala

debian/grass-core.lintian-overrides

@@ -46,3 +46,6 @@ grass-core: hardening-no-fortify-functions usr/lib/grass*/lib/libgrass_segment.*
 grass-core: extra-license-file usr/lib/grass*/etc/license
 grass-core: extra-license-file usr/share/doc/grass-core/COPYING
 
+# Python 3 not supported yet
+grass-core: dependency-on-python-version-marked-for-end-of-life (Depends: python)
+

debian/grass-dev.lintian-overrides

+# Python 3 not supported yet
+grass-dev: dependency-on-python-version-marked-for-end-of-life (Depends: python)
+

debian/grass-gui.lintian-overrides

+# Python 3 not supported yet
+grass-gui: dependency-on-python-version-marked-for-end-of-life (Depends: python)
+

debian/patches/appstream.patch

-Description: Fix desktop filename.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: not-needed
-
---- a/gui/icons/grass.appdata.xml
-+++ b/gui/icons/grass.appdata.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
- <component type="desktop">
--  <id>grass.desktop</id>
-+  <id>grass74.desktop</id>
-   <metadata_license>CC0-1.0</metadata_license>
-   <project_license>GPL-2.0+</project_license>
-   <summary>GRASS GIS, the Open Source Geographic Information System</summary>

debian/patches/series

 pager
 instdir
 no-fail-html.patch
-appstream.patch
 jquery.patch
 spelling-errors.patch

display/d.grid/d.grid.html

@@ -34,7 +34,7 @@ at one interval <b>size</b>, and again with
 <h2>EXAMPLES</h2>
 
 To draw a red geographic grid with 30 minute grid spacing, run 
-either of the following:
+one of the following commands:
 
 <div class="code"><pre>
 d.grid -g size=00:30:00 color=red
@@ -46,12 +46,23 @@ or
 d.grid -g size=0.5 color=255:0:0
 </pre></div>
 
+<div style="margin: 10px" align="center">
+<img src="d_grid_red_grid.png" alt="d.grid red grid example" border="0">
+<br>
+<i>Figure: Showing a geographic grid in red line color</i>
+</div>
+
 To draw a blue standard rectangular grid at a 500 (meter) spacing run the following:
 
 <div class="code"><pre>
 d.grid size=500 color=blue
 </pre></div>
 
+<div style="margin: 10px" align="center">
+<img src="d_grid_blue_grid.png" alt="d.grid blue grid example" border="0">
+<br>
+<i>Figure: Showing a rectangular grid in blue line color</i>
+</div>
 
 <h2>SEE ALSO</h2>
 
@@ -75,4 +86,4 @@ Text and RGB support: Hamish Bowman<br>
 Background color implemented as part of GSoC 2016 by Adam Laza, CTU in Prague 
 
 <p>
-<i>Last changed: $Date: 2016-09-15 09:51:55 +0200 (Thu, 15 Sep 2016) $</i>
+<i>Last changed: $Date: 2017-12-13 09:38:31 +0100 (Wed, 13 Dec 2017) $</i>