diff --git a/docker-imposm/Dockerfile b/docker-imposm/Dockerfile index dc10196..faeae9f 100644 --- a/docker-imposm/Dockerfile +++ b/docker-imposm/Dockerfile @@ -1,26 +1,16 @@ -FROM golang:1.10 +FROM golang:1.19 MAINTAINER Etienne Trimaille -RUN apt-get update -RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - -RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' -RUN apt update && apt install -y python3-pip \ - libprotobuf-dev libleveldb-dev libgeos-dev \ - libpq-dev python3-dev postgresql-client-11 python-setuptools \ - gdal-bin \ - --no-install-recommends +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install -qy \ + python3-pip gdal-bin libgeos-dev libleveldb-dev postgresql-client -RUN ln -s /usr/lib/libgeos_c.so /usr/lib/libgeos.so - -WORKDIR $GOPATH -RUN go get github.com/tools/godep -RUN git clone https://github.com/omniscale/imposm3 src/github.com/omniscale/imposm3 -RUN cd src/github.com/omniscale/imposm3 && make update_version && go install ./cmd/imposm/ - -ADD requirements.txt /home/requirements.txt -RUN pip3 install -r /home/requirements.txt - -ADD importer.py /home/ +RUN go install github.com/omniscale/imposm3/cmd/imposm@latest WORKDIR /home -CMD ["python3", "-u", "/home/importer.py"] +ADD requirements.txt . +RUN pip3 install -r requirements.txt + +ADD importer.py . + +CMD ["python3", "-u", "importer.py"]