# HG changeset patch # User Bjoern Schilberg # Date 1550063775 -3600 # Node ID 32441ac04c7c32fdbe204c01eb89f56969b5dc05 # Parent 39586a34979cb9a76124daa9b77a8fd6c0375e93 Reverted accidentally updated Dockerfiles. diff -r 39586a34979c -r 32441ac04c7c docker/Dockerfile.db --- 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 diff -r 39586a34979c -r 32441ac04c7c docker/Dockerfile.geoserv --- 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