Mercurial > gemma

changeset 2236:32441ac04c7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverted accidentally updated Dockerfiles.
author Bjoern Schilberg <bjoern@intevation.de>
date Wed, 13 Feb 2019 14:16:15 +0100
parents 39586a34979c
children a78f19ff7cde
files docker/Dockerfile.db docker/Dockerfile.geoserv
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/docker/Dockerfile.db	Wed Feb 13 13:50:59 2019 +0100
+++ b/docker/Dockerfile.db	Wed Feb 13 14:16:15 2019 +0100
@@ -15,7 +15,6 @@
     apt-key add - &&\
     apt-get update &&\
     apt-get -y install postgresql-11-postgis-2.5 postgresql-11-pgtap
-RUN apt-get -y install --no-install-recommends postgis xsltproc jq
 
 USER postgres
 ENV PGBIN /usr/lib/postgresql/11/bin
@@ -39,9 +38,8 @@
 WORKDIR /opt/gemma
 COPY schema/*.sql schema/*.sh ./
 COPY schema/demo-data ./demo-data/
-COPY schema/geonames-import ./geonames-import/
 RUN $PGBIN/pg_ctl start -wo "--config_file=$PGCONF" && \
-    ./install-db.sh --demo -G --metapw "geo2Serv" && \
+    ./install-db.sh --demo --metapw "geo2Serv" && \
     $PGBIN/pg_ctl stop -m smart
 
 # Set the default command to run when starting the container
--- a/docker/Dockerfile.geoserv	Wed Feb 13 13:50:59 2019 +0100
+++ b/docker/Dockerfile.geoserv	Wed Feb 13 14:16:15 2019 +0100
@@ -13,8 +13,7 @@
 ENV CATALINA_BASE /var/lib/tomcat8
 ENV CATALINA_TMPDIR /tmp/tomcat8-tmp
 
-#ENV GS_URL https://downloads.sourceforge.net/project/geoserver/GeoServer
-ENV GS_URL https://netcologne.dl.sourceforge.net/project/geoserver/GeoServer
+ENV GS_URL https://downloads.sourceforge.net/project/geoserver/GeoServer
 
 ENV GS_VERSION 2.14.2
 ENV GS_DATADIR /opt/geoserver/data