changeset 1356:ce24990b3d5c

add licensing hint to docker files * Use LABEL to add a description to the docker images that hints towards the use of gemma and gives the url of the current repo. * Fixes a markdown formatto in the README.md.
author Bernhard Reiter <bernhard@intevation.de>
date Mon, 26 Nov 2018 16:12:09 +0100
parents b0ebb77f4ab0
children f3bcce4e6f22
files docker/Dockerfile.backend docker/Dockerfile.db docker/Dockerfile.geoserv docker/Dockerfile.spa docker/README.md
diffstat 5 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/docker/Dockerfile.backend	Mon Nov 26 15:52:30 2018 +0100
+++ b/docker/Dockerfile.backend	Mon Nov 26 16:12:09 2018 +0100
@@ -1,5 +1,7 @@
 FROM ubuntu:bionic
 LABEL authors="tom.gottfried@intevation.de"
+LABEL description="Contains software from gemma, for right holders and\
+ licensing infos, see https://hg.intevation.de/gemma ."
 
 RUN sed -i 's/\(deb.*\)$/\1 universe/' /etc/apt/sources.list
 
--- a/docker/Dockerfile.db	Mon Nov 26 15:52:30 2018 +0100
+++ b/docker/Dockerfile.db	Mon Nov 26 16:12:09 2018 +0100
@@ -1,5 +1,7 @@
 FROM ubuntu:bionic
 LABEL authors="tom.gottfried@intevation.de"
+LABEL description="Contains software from gemma, for right holders and\
+ licensing infos, see https://hg.intevation.de/gemma ."
 
 RUN apt-get update &&\
     apt-get -y install --no-install-recommends curl gnupg
--- a/docker/Dockerfile.geoserv	Mon Nov 26 15:52:30 2018 +0100
+++ b/docker/Dockerfile.geoserv	Mon Nov 26 16:12:09 2018 +0100
@@ -1,5 +1,7 @@
 FROM ubuntu:bionic
 LABEL authors="tom@intevation.de"
+LABEL description="Contains software from gemma, for right holders and\
+ licensing infos, see https://hg.intevation.de/gemma ."
 
 RUN sed -i 's/\(deb.*\)$/\1 universe/' /etc/apt/sources.list
 
--- a/docker/Dockerfile.spa	Mon Nov 26 15:52:30 2018 +0100
+++ b/docker/Dockerfile.spa	Mon Nov 26 16:12:09 2018 +0100
@@ -1,5 +1,7 @@
 FROM ubuntu:bionic
 LABEL authors="tom@intevation.de"
+LABEL description="Contains software from gemma, for right holders and\
+ licensing infos, see https://hg.intevation.de/gemma ."
 
 RUN sed -i 's/\(deb.*\)$/\1 universe/' /etc/apt/sources.list
 
--- a/docker/README.md	Mon Nov 26 15:52:30 2018 +0100
+++ b/docker/README.md	Mon Nov 26 16:12:09 2018 +0100
@@ -34,7 +34,7 @@
 
 ## Create ER diagrams
 
-Assuming you have installed postgresql_autodoc and graphviz on a machine
+Assuming you have installed `postgresql_autodoc` and `graphviz` on a machine
 from wich you can reach your docker host, you can use the following:
 
 - ER diagram with waterway related tables: