Merge pull request #245 from developmentseed/new_version/nominatim

Nominatim 4.0

Author: Ruben L. Mendoza

chartpress.yaml

@@ -33,7 +33,7 @@ charts:
       # tiler-visor:
       #   valuesPath: tilerVisor.image
       nominatim:
-        valuesPath: nominatim.image
+        valuesPath: nominatimApi.image
       overpass-api:
         valuesPath: overpassApi.image
       taginfo:

compose/nominatim.yml

@@ -3,28 +3,15 @@ services:
   #####################################################
   ## Nominatim DB-API section
   #####################################################
-  nominatim-db:
-    image: nominatim-db:v1
-    build:
-      context: ../images/nominatim
-      dockerfile: Dockerfile
-    ports:
-      - '5434:5432'
-    volumes:
-      - ../data/nominatim-db-data:/var/lib/postgresql/data
-    command: >
-      /bin/bash -c "
-        sh /app/start.sh
-      "
-    env_file:
-      - ../envs/.env.nominatim
   nominatim-api:
     image: nominatim-api:v1
     build:
       context: ../images/nominatim
       dockerfile: Dockerfile
     ports:
-      - '7070:8080'
-    entrypoint: sh /app/startapache.sh
+      - '8080:8080'
+      - '5432:5432'
+    volumes:
+      - ../data/nominatim-data:/var/lib/postgresql/12/main
     env_file:
-      - ../envs/.env.nominatim
+      - ../envs/.env.nominatim

envs/.env.nominatim.example

@@ -1,19 +1,15 @@
 #######################################
 # Environment variables for nominatim settings
 #######################################
-##### DB
-PG_HOST=nominatim-db
-PG_PORT=5432
-PG_USER=nominatim
-PG_PASSWORD=1234
-PG_DATABASE=nominatim
-PGDATA=/var/lib/postgresql/data
-### API
-OSM_URL_FILE=http://download.geofabrik.de/europe/monaco-latest.osm.bz2
-THREADS=4
+PBF_URL=http://download.geofabrik.de/europe/monaco-latest.osm.pbf
 REPLICATION_URL=http://download.geofabrik.de/europe/monaco-updates
-REPLICATION_MAXINTERVAL=86500
-REPLICATION_UPDATE_INTERVAL=86500
+REPLICATION_UPDATE_INTERVAL=86400
 REPLICATION_RECHECK_INTERVAL=900
-OSMSEED_WEB_API_DOMAIN=localhost
-OSMSEED_OVERPASS_API_DOMAIN=localhost.overpass
+FREEZE=false
+IMPORT_WIKIPEDIA=false
+IMPORT_US_POSTCODES=false
+IMPORT_GB_POSTCODES=false
+IMPORT_TIGER_ADDRESSES=false
+THREADS=4
+NOMINATIM_PASSWORD=abcd1234
+PGDATA=/var/lib/postgresql/12/main

images/nominatim/Dockerfile

@@ -1,155 +1,2 @@
-FROM ubuntu:focal AS build
-
-ENV DEBIAN_FRONTEND noninteractive
-ENV LANG C.UTF-8
-
-WORKDIR /app
-
-RUN true \
-    # Do not start daemons after installation.
-    && echo '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d \
-    && chmod +x /usr/sbin/policy-rc.d \
-    # Install all required packages.
-    && apt-get -y update -qq \
-    && apt-get -y install \
-        locales \
-    && locale-gen en_US.UTF-8 \
-    && update-locale LANG=en_US.UTF-8 \
-    && apt-get -y install \
-        -o APT::Install-Recommends="false" \
-        -o APT::Install-Suggests="false" \
-        # Build tools from sources.
-        build-essential \
-        g++ \
-        cmake \
-        libpq-dev \
-        zlib1g-dev \
-        libbz2-dev \
-        libproj-dev \
-        libexpat1-dev \
-        libboost-dev \
-        libboost-system-dev \
-        libboost-filesystem-dev \
-        # PostgreSQL.
-        postgresql-contrib \
-        postgresql-server-dev-12 \
-        postgresql-12-postgis-3 \
-        postgresql-12-postgis-3-scripts \
-        # PHP and Apache 2.
-        php \
-        php-intl \
-        php-pgsql \
-        apache2 \
-        libapache2-mod-php \
-        # Python 3.
-        python3-dev \
-        python3-pip \
-        python3-tidylib \
-        python3-psycopg2 \
-        python3-setuptools \
-        # Misc.
-        git \
-        curl \
-        wget \
-        sudo
-
-# Configure postgres.
-RUN true \
-    && echo "host all all 0.0.0.0/0 trust" >> /etc/postgresql/12/main/pg_hba.conf \
-    && echo "listen_addresses='*'" >> /etc/postgresql/12/main/postgresql.conf
-
-# Osmium install to run continuous updates.
-RUN pip3 install osmium
-
-# Nominatim install.
-ENV NOMINATIM_VERSION v3.6.0
-
-RUN true \
-    && git clone \
-        --config advice.detachedHead=false \
-        --single-branch \
-        --branch $NOMINATIM_VERSION \
-        --depth 1 \
-        --recursive \
-        https://github.com/openstreetmap/Nominatim.git \
-        src \
-    && cd src \
-    && mkdir build \
-    && cd build \
-    && cmake .. \
-    && make -j`nproc` \
-    && ./utils/setup.php --setup-website \
-    && chmod o=rwx .
-
-# Apache configure.
-# COPY local.php /app/src/build/settings/local.php
-COPY nominatim.conf /etc/apache2/sites-enabled/000-default.conf
-
-# Load initial data.
-ARG with_postcodes_gb
-ARG with_postcodes_us
-
-RUN if [ "$with_postcodes_gb" = "" ]; then \
-    echo "Skipping optional GB postcode file"; \
-    else \
-    echo "Downloading optional GB postcode file"; \
-    curl http://www.nominatim.org/data/gb_postcode_data.sql.gz > /app/src/data/gb_postcode_data.sql.gz; \
-    fi;
-
-RUN if [ "$with_postcodes_us" = "" ]; then \
-    echo "Skipping optional US postcode file"; \
-    else \
-    echo "Downloading optional US postcode file"; \
-    curl http://www.nominatim.org/data/us_postcode_data.sql.gz > /app/src/data/us_postcode_data.sql.gz; \
-    fi;
-
-RUN curl http://www.nominatim.org/data/country_grid.sql.gz > /app/src/data/country_osm_grid.sql.gz
-
-RUN true \
-    # Remove development and unused packages.
-    && apt-get -y remove --purge \
-        cpp-9 \
-        gcc-9* \
-        g++ \
-        git \
-        make \
-        cmake* \
-        llvm-10* \
-        libc6-dev \
-        linux-libc-dev \
-        libclang-*-dev \
-        build-essential \
-        postgresql-server-dev-12 \
-    && apt-get clean \
-    # Clear temporary files and directories.
-    && rm -rf \
-        /tmp/* \
-        /var/tmp/* \
-        /root/.cache \
-        /app/src/.git \
-        /var/lib/apt/lists/* \
-        /var/lib/postgresql/12/main/*
-
-# Postgres PGDATA as volume
-ENV PATH $PATH:/usr/lib/postgresql/12/bin
-ENV PGDATA /var/lib/postgresql/data
-RUN mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA"
-VOLUME /var/lib/postgresql/data
-
-COPY local_api.php /app/src/build/settings/local_api.php
-COPY init.sh /app/init.sh
-COPY startapache.sh /app/startapache.sh
-COPY startpostgres.sh /app/startpostgres.sh
-COPY update.sh /app/update.sh
-COPY start.sh /app/start.sh
-COPY replace_domain.sh /app/replace_domain.sh
-
-# Collapse image to single layer.
-FROM scratch
-
-COPY --from=build / /
-
-WORKDIR /app
-
-EXPOSE 5432
-EXPOSE 8080
+FROM mediagis/nominatim:4.0
+ENV PGDATA=/var/lib/postgresql/12/main

images/nominatim/README.md

@@ -1,6 +1,6 @@
-# Nominatim  (Nominatim version 3.6)
+# Nominatim  (Nominatim version 4.0)
 
-This version of Nominatim was copy from https://github.com/mediagis/nominatim-docker/tree/master/3.6, with certain updates  to fit in osm-seed enviroment
+This version of Nominatim was copy from https://github.com/mediagis/nominatim-docker/tree/master/4.0, with certain updates  to fit in osm-seed enviroment
 
 ### Configuration
 
@@ -9,11 +9,3 @@ In order to run this container we need environment variables, these can be found
 - [.env.nominatim.example](./../../envs/.env.nominatim.example)
 
 **Note**: Rename the above files as `.env.nominatim`
-
-#### Running nominatim - DB and API container
-
-```sh
-    # Docker compose
-    docker-compose run nominatim-db
-    docker-compose run nominatim-api
-```