From a81dfbb11eceeabb8ce44e9168cc9cb1f17e74f0 Mon Sep 17 00:00:00 2001 From: fly Date: Tue, 14 Dec 2021 18:18:58 +0100 Subject: [PATCH] Make it work out of the box Signed-off-by: fly --- full/Dockerfile | 6 ++++-- full/general-settings | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/full/Dockerfile b/full/Dockerfile index c391730..3e2d2ef 100644 --- a/full/Dockerfile +++ b/full/Dockerfile @@ -1,6 +1,8 @@ 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 parallel +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 parallel zip &&\ + apt-get clean # pillow dependencies: RUN apt-get -y install libtiff5-dev libjpeg-dev libopenjp2-7-dev zlib1g-dev \ libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \ @@ -14,7 +16,7 @@ ENV EASY_O2C_COMMIT ca231ac539efa4fcd5bbd359956335cffc8aaec8 ENV EASY_O2C_SCRIPTS_COMMIT 836d350f130eff9e86d7338a7d6fb7e2f14617a9 -RUN git clone https://gitlab.com/merspieler/easy-osm2city.git +RUN git clone https://gitea.merspieler.tk/fly/easy-osm2city.git WORKDIR /easy-osm2city COPY general-settings . diff --git a/full/general-settings b/full/general-settings index 06a7249..320a7ba 100644 --- a/full/general-settings +++ b/full/general-settings @@ -12,5 +12,5 @@ fg_scenery=/scenery db_host=o2c-psql db_port=5432 -db_user=osm +db_user=postgres db_passwd="FG-is-GREAT"