Merge pull request #168 from Overv/ubuntu-20.04

Upgrade to Ubuntu 20.04
2021-03-07 16:34:51 +01:00 · 2021-03-07 16:34:21 +01:00 · 2021-03-01 21:47:13 +01:00 · 2021-02-21 15:37:07 +01:00 · 2021-02-10 21:09:28 +01:00 · 2021-02-07 15:56:36 -05:00
2 changed files with 7 additions and 9 deletions
@@ -1,7 +1,7 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04

 # Based on
-# https://switch2osm.org/manually-building-a-tile-server-18-04-lts/
+# https://switch2osm.org/serving-tiles/manually-building-a-tile-server-18-04-lts/

 # Set up environment
 ENV TZ=UTC
@@ -43,20 +43,18 @@ RUN apt-get install -y --no-install-recommends \
  libgdal-dev \
  libgeos++-dev \
  libgeos-dev \
-  libgeotiff-epsg \
  libicu-dev \
  liblua5.3-dev \
  libmapnik-dev \
  libpq-dev \
  libproj-dev \
-  libprotobuf-c0-dev \
+  libprotobuf-c-dev \
  libtiff5-dev \
  libtool \
  libxml2-dev \
  lua5.3 \
  make \
  mapnik-utils \
-  node-gyp \
  osmium-tool \
  osmosis \
  postgis \
@@ -79,7 +77,7 @@ RUN apt-get install -y --no-install-recommends \
 && rm -rf /var/lib/{apt,dpkg,cache,log}/

 # Set up PostGIS
-RUN wget https://download.osgeo.org/postgis/source/postgis-3.0.0.tar.gz -O postgis.tar.gz \
+RUN wget https://download.osgeo.org/postgis/source/postgis-3.1.1.tar.gz -O postgis.tar.gz \
 && mkdir -p postgis_src \
 && tar -xvzf postgis.tar.gz --strip 1 -C postgis_src \
 && rm postgis.tar.gz \
@@ -124,7 +122,7 @@ RUN mkdir -p /home/renderer/src \
 # Configure stylesheet
 RUN mkdir -p /home/renderer/src \
 && cd /home/renderer/src \
- && git clone --single-branch --branch v4.23.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
+ && git clone --single-branch --branch v5.2.0 https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 \
 && cd openstreetmap-carto \
 && rm -rf .git \
 && npm install -g carto@0.18.2 \
@@ -170,7 +168,7 @@ RUN mkdir -p /home/renderer/src \
 && cd /home/renderer/src \
 && git clone https://github.com/zverik/regional \
 && cd regional \
- && git checkout 612fe3e040d8bb70d2ab3b133f3b2cfc6c940520 \
+ && git checkout 889d630a1e1a1bacabdd1dad6e17b49e7d58cd4b \
 && rm -rf .git \
 && chmod u+x /home/renderer/src/regional/trim_osc.py

@@ -2,7 +2,7 @@

 [![Build Status](https://travis-ci.org/Overv/openstreetmap-tile-server.svg?branch=master)](https://travis-ci.org/Overv/openstreetmap-tile-server) [![](https://images.microbadger.com/badges/image/overv/openstreetmap-tile-server.svg)](https://microbadger.com/images/overv/openstreetmap-tile-server "openstreetmap-tile-server")

-This container allows you to easily set up an OpenStreetMap PNG tile server given a `.osm.pbf` file. It is based on the [latest Ubuntu 18.04 LTS guide](https://switch2osm.org/manually-building-a-tile-server-18-04-lts/) from [switch2osm.org](https://switch2osm.org/) and therefore uses the default OpenStreetMap style.
+This container allows you to easily set up an OpenStreetMap PNG tile server given a `.osm.pbf` file. It is based on the [latest Ubuntu 18.04 LTS guide](https://switch2osm.org/serving-tiles/manually-building-a-tile-server-18-04-lts/) from [switch2osm.org](https://switch2osm.org/) and therefore uses the default OpenStreetMap style.

 ## Setting up the server
Author	SHA1	Message	Date
Alexander Overvoorde	75e7714f20	Merge pull request #168 from Overv/ubuntu-20.04 Upgrade to Ubuntu 20.04	2021-03-07 16:34:51 +01:00
Alexander Overvoorde	ec500a2cde	Upgrade to Ubuntu 20.04	2021-03-07 16:34:21 +01:00
Alexander Overvoorde	affae5a92d	Merge pull request #169 from mhajder/feature/update-components Update PostGIS, OpenStreetMap Carto stylesheet and trim_osc.py helper	2021-03-01 21:47:13 +01:00
Mateusz Hajder	a204fb85fd	Update PostGIS, OpenStreetMap Carto stylesheet and trim_osc.py helper	2021-02-21 15:37:07 +01:00
Alexander Overvoorde	7636079b4d	Merge pull request #164 from jdmonin/readme-switch-url-moved	2021-02-10 21:09:28 +01:00
Jeremy D Monin	2ae828c52b	Dockerfile: Update same switch2osm.org url as readme	2021-02-07 15:56:36 -05:00
Jeremy D Monin	6fb62935f3	README: Update link to switch2osm.org tile server guide	2021-02-06 16:20:46 -05:00