Merge pull request #2 from smithmicro/ubuntu

ubuntu:focal

Author: dsperling

README.md

@@ -9,7 +9,7 @@ n7m is Nominatim packaged in Docker images with separation of responsibilities b
 ## Overview
 This set of Docker images seperates responsbility into 5 areas:
 * **n7m-app** - The main Nomainatim service running Apache/PHP connecting to `n7m-gis`
-  * **feed** - Uses the `n7m-app` image to set up the `n7m-gis` database.  Can also be used for updates and downloading OSM files.
+  * **feed** - Uses the `n7m-app` image to set up the `n7m-gis` database.  Can also be used for updates and downloading files.
 * **n7m-test** - Runs all unit tests
 * **n7m-gis** - Postgis database 
 * **n7m-ui** - Test web user interface
@@ -50,14 +50,15 @@ This set of Docker images seperates responsbility into 5 areas:
 ## To Use
 1. Build all the images:
    * `docker-compose build`
-2. Download the desired OSM files:
-   * To download Monaco, Wikimedia data and country grids:
-   * `docker-compose run feed download --monaco --wiki --grid`
-3. Edit the OSM_FILENAME environment varianble in `docker-compose.yml` file to select the downloaded OSM file.
-   * The default is monaco-latest.osm.pbf
-4. Run `docker-compose up`
+2. Download Wikimedia data and country grids (optional):
+   * `docker-compose run feed download --wiki --grid`
+3. Download OSM Data.  We recommend [openmaptiles-tools](https://github.com/openmaptiles/openmaptiles-tools).  For Monaco:
+   * `docker run -v $PWD/data:/tileset openmaptiles/openmaptiles-tools download-osm monaco`
+4. Edit the OSM_FILENAME environment varianble in `docker-compose.yml` file to select the downloaded OSM file.
+   * The default is `monaco-latest.osm.pbf` which was downloaded in step 3.
+5. Run `docker-compose up`
    * Since the import process is long, the `n7m-app` container terminates after 10 seconds.  Run `docker-compose up` again after import so it restarts.
-5. Browse to: `http://localhost:8080`
+6. Browse to: `http://localhost:8080`
 
 ## Additional Commands
 1. To reset the database:
@@ -75,13 +76,19 @@ For updates, consider these configurations:
 * NOMINATIM_REPLICATION_URL - you will want to set this to a closer mirror.
 
 ## Ubuntu vs Debian
-`debian:bullseye-slim` was selected as the base image as it is slightly smealler than `ubuntu:focal` and supports PoostgreSQL 13.  Versions that are included below (at the time of this writing):
+`ubuntu:jammy` was selected as the base image for branch image as to begin testing the lastest LTS release.  Versions that are included below (at the time of this writing):
 * `debian:bullseye-slim`
   * 454MB Image for `n7m-app`
   * Python 3.9.2, PHP 7.4.28, psql 13.7
 * `ubuntu:focal`
   * 485MB Image for `n7m-app`
   * Python 3.8.10, PHP 7.4.3, psql 12.11
+* `debian:bookworm-slim` (not released)
+  * 501MB Image for `n7m-app`
+  * Python 3.10.5, PHP 8.1.5, psql 14.4
+* `ubuntu:jammy`
+  * 528MB Image for `n7m-app`
+  * Python 3.10.4, PHP 8.1.2, psql 14.3
 
 ## Advanced Tokenizer
 This image only uses the ICU Tokenizer.  By default the included `tokenizer.php` file drives the PHP code and has a simple English tokenizer.
@@ -102,3 +109,8 @@ To run n7m in AWS, the minimum EC2 Instance sizing is:
 * Storage: 500GB SSD (270G required for North America)
 
 Note:  At 16 GB RAM, `t3.xlarge` is too small and runs out of memory for osm2pgsql during a North America test.
+
+## Downloading data
+https://wiki.openstreetmap.org/wiki/Downloading_data
+
+docker run -v $PWD:/data openmaptiles/openmaptiles-tools download-osm

app/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim AS build
+FROM ubuntu:jammy AS build
 
 # https://nominatim.org/release-docs/develop/appendix/Install-on-Ubuntu-20/
 # Changes from the docs:
@@ -23,10 +23,10 @@ RUN apt-get update && apt-get install -y \
     php-cgi \
     php-pgsql \
     php-intl \
-    postgresql-13-postgis-3 \
-    postgresql-13-postgis-3-scripts \
-    postgresql-contrib-13 \
-    postgresql-server-dev-13 \
+    postgresql-14-postgis-3 \
+    postgresql-14-postgis-3-scripts \
+    postgresql-contrib-14 \
+    postgresql-server-dev-14 \
     python3-datrie \
     python3-dotenv \
     python3-icu \
@@ -50,7 +50,7 @@ RUN curl -O -L http://www.nominatim.org/release/Nominatim-$NOMINATIM_VERSION.tar
  && make install
 
 # now start over from the same base image
-FROM debian:bullseye-slim
+FROM ubuntu:jammy
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -65,7 +65,7 @@ RUN apt-get update && apt-get install -y \
     php-fpm \
     php-pgsql \
     php-intl \
-    postgresql-client-13 \
+    postgresql-client-14 \
     python3-datrie \
     python3-dotenv \
     python3-icu \

app/download.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
-set -e
+# download data from www.nominatim.org
+# For OSM files, please use:
+# https://github.com/openmaptiles/openmaptiles-tools
 
-MIRROR_URI=https://download.geofabrik.de
+set -e
 
 download() {
   DOWNLOAD_FILENAME=$(basename "$1")
@@ -21,15 +23,6 @@ download() {
 
 help() {
   echo "download [-n|-m|-w|-u|-k|-g|-h] [long options see below]"
-  echo "  -f|--africa -          Africa OSM file"
-  echo "  -t|--antarctica -      Antarctica OSM file"
-  echo "  -a|--asia -            Asia OSM file"
-  echo "  -o|--oceania -         Australia and Oceania OSM file"
-  echo "  -c|--central-america - Central America OSM file"
-  echo "  -e|--europe -          Europe OSM file"
-  echo "  -n|--north-america -   North America OSM file"
-  echo "  -s|--south-america -   South America OSM file"
-  echo "  -m|--monaco -          Monaco OSM File - a small test"
   echo "  -w|--wiki -      Wikimedia file to improve search"
   echo "  -u|--us-postal - US postal code data"
   echo "  -k|--uk-postal - UK postal code data"
@@ -42,54 +35,18 @@ help() {
 
 while [[ $# -gt 0 ]]; do
   case $1 in
-    -f|--africa)
-      download $MIRROR_URI/africa-latest.osm.pbf
-      shift
-      ;;
-    -t|--antarctica)
-      download $MIRROR_URI/antarctica-latest.osm.pbf
-      shift
-      ;;
-    -a|--asia)
-      download $MIRROR_URI/asia-latest.osm.pbf
-      shift
-      ;;
-    -o|--oceania)
-      download $MIRROR_URI/australia-oceania-latest.osm.pbf
-      shift
-      ;;
-    -c|--central-america)
-      download $MIRROR_URI/central-america-latest.osm.pbf
-      shift
-      ;;
-    -e|--europe)
-      download $MIRROR_URI/europe-latest.osm.pbf
-      shift
-      ;;
-    -n|--north-america)
-      download $MIRROR_URI/north-america-latest.osm.pbf
-      shift
-      ;;
-    -s|--south-america)
-      download $MIRROR_URI/south-america-latest.osm.pbf
-      shift
-      ;;
-    -m|--monaco)
-      download $MIRROR_URI/europe/monaco-latest.osm.pbf
-      shift
-      ;;
     -w|--wiki)
       # improve the quality of search results
       download https://www.nominatim.org/data/wikimedia-importance.sql.gz
       shift
       ;;
     -u|--us-postal)
-      # improve postal code search
+      # improve US postal code search
       download https://www.nominatim.org/data/us_postcodes.csv.gz
       shift
       ;;
     -k|--uk-postal)
-      # improve postal code search
+      # improve UK postal code search
       download https://www.nominatim.org/data/gb_postcodes.csv.gz
       shift
       ;;

gis/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgis/postgis:13-3.2-alpine
+FROM postgis/postgis:14-3.2-alpine
 
 # Nominatim recommended configuration
 COPY --chown=postgres:postgres postgresql.conf /etc/postgresql/postgresql.conf

test/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim AS build
+FROM ubuntu:jammy AS build
 
 # https://nominatim.org/release-docs/develop/appendix/Install-on-Ubuntu-20/
 # Changes from the docs:
@@ -23,10 +23,10 @@ RUN apt-get update && apt-get install -y \
     php-cgi \
     php-pgsql \
     php-intl \
-    postgresql-13-postgis-3 \
-    postgresql-13-postgis-3-scripts \
-    postgresql-contrib-13 \
-    postgresql-server-dev-13 \
+    postgresql-14-postgis-3 \
+    postgresql-14-postgis-3-scripts \
+    postgresql-contrib-14 \
+    postgresql-server-dev-14 \
     python3-datrie \
     python3-dotenv \
     python3-icu \
@@ -50,7 +50,7 @@ RUN curl -O -L http://www.nominatim.org/release/Nominatim-$NOMINATIM_VERSION.tar
  && make install
 
 # now start over from the same base image
-FROM debian:bullseye-slim
+FROM ubuntu:jammy
 
 # https://nominatim.org/release-docs/4.0.1/develop/Testing/
 ENV DEBIAN_FRONTEND=noninteractive
@@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y \
     php-codecoverage \
     php-pgsql \
     php-xdebug \
-    postgresql-client-13 \
+    postgresql-client-14 \
     python3-behave \
     python3-datrie \
     python3-dotenv \