kopia lustrzana https://github.com/kartoza/docker-osm
update apt and golang version
rodzic
b8ef57c49a
commit
94d4b04c7b
|
@ -2,7 +2,7 @@ version: '2.1'
|
|||
|
||||
services:
|
||||
storage:
|
||||
image: ubuntu:bionic
|
||||
image: ubuntu:18.04
|
||||
volumes:
|
||||
# These are sharable to other containers
|
||||
- ./settings:/home/settings
|
||||
|
@ -66,7 +66,6 @@ services:
|
|||
# Use clip in the database
|
||||
- CLIP=no
|
||||
|
||||
|
||||
osmupdate:
|
||||
build: docker-osmupdate
|
||||
volumes_from:
|
||||
|
@ -91,4 +90,3 @@ services:
|
|||
# seconds between 2 executions of the script
|
||||
# if 0, then no update will be done, only the first initial import from the PBF
|
||||
- TIME=120
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
FROM golang:1.9
|
||||
FROM golang:1.10
|
||||
MAINTAINER Etienne Trimaille <etienne@kartoza.com>
|
||||
|
||||
RUN apt-get update && apt-get install -y python3-pip \
|
||||
RUN apt update && apt install -y python3-pip \
|
||||
libprotobuf-dev libleveldb-dev libgeos-dev \
|
||||
libpq-dev python3-dev postgresql-client-9.6 python-setuptools \
|
||||
--no-install-recommends
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
|
||||
FROM ubuntu:latest
|
||||
FROM ubuntu:18.04
|
||||
MAINTAINER Etienne Trimaille<etienne@kartoza.com>
|
||||
|
||||
RUN export DEBIAN_FRONTEND=noninteractive
|
||||
|
@ -12,13 +12,13 @@ RUN dpkg-divert --local --rename --add /sbin/initctl
|
|||
ADD 71-apt-cacher-ng /etc/apt/apt.conf.d/71-apt-cacher-ng
|
||||
|
||||
# RUN echo "deb http://archive.ubuntu.com/ubuntu trusty main universe" > /etc/apt/sources.list
|
||||
RUN apt-get -y update
|
||||
RUN apt-get -y install ca-certificates rpl pwgen python3
|
||||
RUN apt -y update
|
||||
RUN apt -y install ca-certificates rpl pwgen python3
|
||||
|
||||
#-------------Application Specific Stuff ----------------------------------------------------
|
||||
|
||||
# Install osmupdate
|
||||
RUN apt-get -y install osmctools wget gzip gcc libc-dev zlib1g-dev
|
||||
RUN apt -y install osmctools wget gzip gcc libc-dev zlib1g-dev
|
||||
WORKDIR /home
|
||||
ADD osmupdate.c /home/osmupdate.c
|
||||
ADD osmconvert.c /home/osmconvert.c
|
||||
|
|
Ładowanie…
Reference in New Issue