From 70913aa378b84b0fb89235fb5836945d72b7e19b Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Fri, 16 Feb 2018 09:49:40 +0300 Subject: [PATCH] update golang, postgres, setuptools --- .gitignore | 1 + docker-imposm3/Dockerfile | 4 ++-- docker-imposm3/importer.py | 1 + docker-osmupdate/download.py | 1 + logs/.gitkeep | 0 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 logs/.gitkeep diff --git a/.gitignore b/.gitignore index 97cf05e..189e7f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea *.*~ +*.log cache import_done import_queue diff --git a/docker-imposm3/Dockerfile b/docker-imposm3/Dockerfile index a6befb8..078b77f 100644 --- a/docker-imposm3/Dockerfile +++ b/docker-imposm3/Dockerfile @@ -1,9 +1,9 @@ -FROM golang:1.6 +FROM golang:1.9 MAINTAINER Etienne Trimaille RUN apt-get update && apt-get install -y python-pip \ libprotobuf-dev libleveldb-dev libgeos-dev \ - libpq-dev python-dev postgresql-client-9.4 \ + libpq-dev python-dev postgresql-client-9.6 python-setuptools \ --no-install-recommends RUN ln -s /usr/lib/libgeos_c.so /usr/lib/libgeos.so diff --git a/docker-imposm3/importer.py b/docker-imposm3/importer.py index 0525357..15c6c5e 100644 --- a/docker-imposm3/importer.py +++ b/docker-imposm3/importer.py @@ -328,6 +328,7 @@ class Importer(object): self.info('Sleeping for %s seconds.' % self.default['TIME']) sleep(float(self.default['TIME'])) + if __name__ == '__main__': importer = Importer() importer.overwrite_environment() diff --git a/docker-osmupdate/download.py b/docker-osmupdate/download.py index c23ed01..1ba82da 100644 --- a/docker-osmupdate/download.py +++ b/docker-osmupdate/download.py @@ -155,6 +155,7 @@ class Downloader(object): self.info('Sleeping for %s seconds.' % self.default['TIME']) sleep(float(self.default['TIME'])) + if __name__ == '__main__': downloader = Downloader() downloader.overwrite_environment() diff --git a/logs/.gitkeep b/logs/.gitkeep new file mode 100644 index 0000000..e69de29