Merge pull request #3 from smithmicro/feature/4.2

dsperling · web-flow · commit 5eb140a3eb51 · 2023-04-23T08:13:59.000-07:00
Feature/4.2
diff --git a/README.md b/README.md
@@ -4,13 +4,12 @@ Minimalistic Docker images for Nominatim
 ## About
 n7m is a [Numeronym](https://en.wikipedia.org/wiki/Numeronym) for [Nominatim](https://nominatim.org/).
 
-n7m is Nominatim packaged in Docker images with separation of responsibilities between housing the web server, ui, applicaiton server, setup processes, tests and PostgreSQL.
+n7m is Nominatim packaged in Docker images with separation of responsibilities between housing the web server, ui, applicaiton server, setup processes and PostgreSQL.
 
 ## 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 files.
-* **n7m-test** - Runs all unit tests
 * **n7m-gis** - Postgis database 
 * **n7m-ui** - Test web user interface
 * **n7m-web** - nginx web sever that hosts:
@@ -30,22 +29,22 @@ This set of Docker images seperates responsbility into 5 areas:
 +--------------+      +--------------+
               |        |
               v   80   v
-        +--------------+     +--------------+     +--------------+
-        |              |     |              |     |              |
-        |   n7m-app    |     |   n7m-test   |     |     feed     |
-        |              |     |              |     |              |
-        +--------------+     +--------------+     +--------------+
-        |    debian    |     |    debian    |     |   n7m-app    |
-        +--------------+     +--------------+     +--------------+
-                      |             |              |        |
-                      v     5432    v              v        v
-        /--------\    +----------------------------+    /--------\
-        | volume |<---|                            |    | volume |
-        | pgdata |    |          n7m-gis           |    |  data  |
-        \--------/    +                            +    \--------/
-                      |----------------------------+ 
-                      |      postgis/postgis       |
-                      +----------------------------+
+        +--------------+      +--------------+
+        |              |      |              |
+        |   n7m-app    |      |     feed     |
+        |              |      |              |
+        +--------------+      +--------------+
+        | ubuntu:jammy |      |   n7m-app    |
+        +--------------+      +--------------+
+                      |                 |   |
+                      v       5432      v   v
+        /--------\    +-----------------+   /--------\
+        | volume |<---|                 |   | volume |
+        | pgdata |    |     n7m-gis     |   |  data  |
+        \--------/    +                 +   \--------/
+                      |-----------------+ 
+                      | postgis/postgis |
+                      +-----------------+
 ```
 ## To Use
 1. Build all the images:
@@ -67,29 +66,12 @@ This set of Docker images seperates responsbility into 5 areas:
    * `docker-compose run feed setup`
 3. To update:
    * `docker-compose run feed update`
-3. To run unit tests:
-   * `docker-compose run test make`
 
 ## Configuration Hints
 For updates, consider these configurations:
 * NOMINATIM_REPLICATION_MAX_DIFF - you will want to set this to a larger number.
 * NOMINATIM_REPLICATION_URL - you will want to set this to a closer mirror.
 
-## Ubuntu vs Debian
-`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.
 
@@ -109,8 +91,3 @@ 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
diff --git a/app/Dockerfile b/app/Dockerfile
@@ -1,22 +1,22 @@
 FROM ubuntu:jammy AS build
 
-# https://nominatim.org/release-docs/develop/appendix/Install-on-Ubuntu-20/
-# Changes from the docs:
-# We do not need git
-# Other than that, upgraded to PostgreSQL 13 and alphabetized
+# https://nominatim.org/release-docs/develop/appendix/Install-on-Ubuntu-22/
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
+    ca-certificates \
     cmake \
     curl \
+    git \
     g++ \
     libboost-dev \
     libboost-filesystem-dev \
     libboost-system-dev \
     libbz2-dev \
     libexpat1-dev \
     libicu-dev \
+    liblua5.4-dev \
     libpq-dev \
     libproj-dev \
     php \
@@ -36,16 +36,17 @@ RUN apt-get update && apt-get install -y \
     python3-yaml \
     zlib1g-dev
 
-ENV NOMINATIM_VERSION=4.0.1
+ENV NOMINATIM_VERSION=4.2.3
 
+# Fetch
 WORKDIR /nominatim
-
-# Build as install
 RUN curl -O -L http://www.nominatim.org/release/Nominatim-$NOMINATIM_VERSION.tar.bz2 \
  && tar xvf Nominatim-$NOMINATIM_VERSION.tar.bz2 \
- && mkdir build \
- && cd build \
- && cmake ../Nominatim-$NOMINATIM_VERSION \
+ && mv Nominatim-$NOMINATIM_VERSION Nominatim
+
+# Build as install
+WORKDIR /nominatim/build
+RUN cmake ../Nominatim \
  && make \
  && make install
 
@@ -55,10 +56,13 @@ FROM ubuntu:jammy
 ENV DEBIAN_FRONTEND=noninteractive
 
 # install dependencies of the built binaries
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     apache2 \
+    ca-certificates \
     curl \
     libapache2-mod-php \
+    libboost-filesystem-dev \
+    liblua5.4 \
     libproj-dev \
     php \
     php-cgi \
@@ -73,7 +77,9 @@ RUN apt-get update && apt-get install -y \
     python3-psutil \
     python3-psycopg2 \
     python3-pyosmium \
-    python3-yaml
+    python3-yaml \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
 
 # For settings, see: https://nominatim.org/release-docs/develop/customize/Settings/
 ENV NOMINATIM_TOKENIZER=icu \
diff --git a/app/download.sh b/app/download.sh
@@ -6,14 +6,17 @@
 
 set -e
 
+# https://nominatim.org server requires a User Agent
+USER_AGENT="smithmicro/n7m-app"
+
 download() {
   DOWNLOAD_FILENAME=$(basename "$1")
   DOWNLOAD_PATH=/data/$DOWNLOAD_FILENAME
 
   if [ -s ${DOWNLOAD_PATH} ]; then
     echo "OSM file $DOWNLOAD_PATH already exists, skipping download"
   else
-    curl -L -o $DOWNLOAD_PATH $1
+    curl -L -A $USER_AGENT -o $DOWNLOAD_PATH $1
     if [ $? != 0 ]; then
       echo "Failed to download file $DOWNLOAD_FILENAME"
       exit 1
@@ -37,22 +40,22 @@ while [[ $# -gt 0 ]]; do
   case $1 in
     -w|--wiki)
       # improve the quality of search results
-      download https://www.nominatim.org/data/wikimedia-importance.sql.gz
+      download https://nominatim.org/data/wikimedia-importance.sql.gz
       shift
       ;;
     -u|--us-postal)
       # improve US postal code search
-      download https://www.nominatim.org/data/us_postcodes.csv.gz
+      download https://nominatim.org/data/us_postcodes.csv.gz
       shift
       ;;
     -k|--uk-postal)
       # improve UK postal code search
-      download https://www.nominatim.org/data/gb_postcodes.csv.gz
+      download https://nominatim.org/data/gb_postcodes.csv.gz
       shift
       ;;
     -g|--grid)
       # grab country grids
-      download https://www.nominatim.org/data/country_grid.sql.gz
+      download https://nominatim.org/data/country_grid.sql.gz
       shift
       ;;
     -h|--help)
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,15 +37,6 @@ services:
     command: setup
     volumes:
       - ${PWD}/data:/data/
-  test:
-    build: test
-    image: smithmicro/n7m-test
-    environment:
-      - PGPASSWORD=n7m-geocoding
-    depends_on:
-      - gis
-    mem_limit: 200m
-    command: "true"
   gis:
     build: gis
     image: smithmicro/n7m-gis
diff --git a/gis/Dockerfile b/gis/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgis/postgis:14-3.2-alpine
+FROM postgis/postgis:14-3.3-alpine
 
 # Nominatim recommended configuration
 COPY --chown=postgres:postgres postgresql.conf /etc/postgresql/postgresql.conf
diff --git a/test/Dockerfile b/test/Dockerfile
diff --git a/ui/Dockerfile b/ui/Dockerfile
@@ -1,8 +1,8 @@
-FROM nginx:1.22-alpine
+FROM nginx:1.24-alpine
 
 # https://nominatim.org/release-docs/latest/admin/Setup-Nominatim-UI/
 
-ENV NOMINATIM_UI_VERSION=3.2.4
+ENV NOMINATIM_UI_VERSION=3.2.12
 ENV NOMINATIM_UI_FILENAME=nominatim-ui-$NOMINATIM_UI_VERSION
 ENV NOMINATIM_APINOMINATIM_API_ENDPOINT_URI=/api/v4/
 ENV NGINX_HTML_PATH=/usr/share/nginx/html
diff --git a/web/Dockerfile b/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx:1.22-alpine
+FROM nginx:1.24-alpine
 
 COPY site.conf /etc/nginx/conf.d/default.conf

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM postgis/postgis:14-3.2-alpine`
	`1`	`+FROM postgis/postgis:14-3.3-alpine`
`2`	`2`
`3`	`3`	`# Nominatim recommended configuration`
`4`	`4`	`COPY --chown=postgres:postgres postgresql.conf /etc/postgresql/postgresql.conf`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FROM nginx:1.22-alpine`
	`1`	`+FROM nginx:1.24-alpine`
`2`	`2`
`3`	`3`	`COPY site.conf /etc/nginx/conf.d/default.conf`