From 7cc3826eabb6c6efc00e9fc9f4677ee9f28b15c4 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Wed, 25 May 2016 10:01:11 +0200 Subject: [PATCH 1/2] bump to golang 1.6 --- docker-imposm3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-imposm3/Dockerfile b/docker-imposm3/Dockerfile index 536f7b3..8a72957 100644 --- a/docker-imposm3/Dockerfile +++ b/docker-imposm3/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.5 +FROM golang:1.6 MAINTAINER Etienne Trimaille RUN apt-get update && apt-get install -y python-pip \ From d44740474028ff11c6bc1f4b90089d95cc3a15a5 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Wed, 25 May 2016 10:09:14 +0200 Subject: [PATCH 2/2] fix install imposm --- docker-imposm3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-imposm3/Dockerfile b/docker-imposm3/Dockerfile index 8a72957..e229f2f 100644 --- a/docker-imposm3/Dockerfile +++ b/docker-imposm3/Dockerfile @@ -11,7 +11,7 @@ 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 && godep go install ./ +RUN cd src/github.com/omniscale/imposm3 && make update_version && go install ./ ADD requirements.txt /home/requirements.txt RUN pip install -r /home/requirements.txt