From 6d1793b8051a9e15cbd7607cf1f4315783f264cb Mon Sep 17 00:00:00 2001 From: fly Date: Sat, 17 Apr 2021 02:50:19 +0200 Subject: [PATCH] Updated full image Signed-off-by: fly --- full/Dockerfile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/full/Dockerfile b/full/Dockerfile index d8be617..42c9b1c 100644 --- a/full/Dockerfile +++ b/full/Dockerfile @@ -2,7 +2,12 @@ FROM debian:buster RUN apt-get -y update && apt-get install -y git osmium-tool osmosis postgis pgadmin3 postgresql-contrib postgresql-client postgresql-postgis postgresql python3-pip python3-venv python3-dev curl sudo flightgear tmux vim wget -RUN pip3 install requests +RUN pip3 install requests tabulate + +ENV OSM2CITY_COMMIT ad086ee509e9d5025c9836918c387ee7514045be +ENV OSM2CITY_DATA_COMMIT 43eb54b82439deafc2d914ead0efe4bea9cd1cf5 +ENV EASY_O2C_COMMIT 706805d34292e357626b3eff508c1ba828111463 +ENV EASY_O2C_SCRIPTS_COMMIT 387f4fc521cee1fe9b666930e962b3bd50767d6a RUN git clone https://gitlab.com/merspieler/easy-osm2city.git @@ -10,9 +15,6 @@ RUN git clone https://gitlab.com/merspieler/easy-osm2city.git WORKDIR /easy-osm2city COPY general-settings . -ENV OSM2CITY_COMMIT ad086ee509e9d5025c9836918c387ee7514045be -ENV OSM2CITY_DATA_COMMIT 43eb54b82439deafc2d914ead0efe4bea9cd1cf5 - # Do some things from the install script manually RUN git clone https://gitlab.com/merspieler/osm2city-scripts.git scripts RUN git clone https://gitlab.com/osm2city/osm2city.git @@ -20,12 +22,13 @@ RUN git clone https://gitlab.com/osm2city/osm2city-data.git RUN mkdir -p pbf && mkdir -p projects && mkdir -p /scenery # Checkout known working commits -RUN cd osm2city && git checkout $OSM2CITY_COMMIT && cd ../osm2city-data && git checkout $OSM2CITY_DATA_COMMIT && cd .. +RUN git checkout $EASY_O2C_COMMIT && \ + cd scripts/ && git checkout $EASY_O2C_SCRIPTS_COMMIT && \ + cd ../osm2city && git checkout $OSM2CITY_COMMIT && \ + cd ../osm2city-data && git checkout $OSM2CITY_DATA_COMMIT && cd .. RUN ./create-venv - - VOLUME /scenery VOLUME /easy-osm2city/projects VOLUME /easy-osm2city/pbf