Separate osmupdate into separate compose command

.travis.yml

@@ -22,6 +22,7 @@ script:
   - docker-compose run import-sql
   - docker-compose run update-scaleranks
   - docker-compose run export
+  - docker-compose run update-osm-diff
   - docker-compose run import-osm-diff
   - docker-compose run changed-tiles
   - docker-compose run export-list

docker-compose.yml

@@ -36,6 +36,11 @@ import-osm-diff:
    - cache
   links:
    - postgis:db
+update-osm-diff:
+  image: "osm2vectortiles/import-osm"
+  command: ./import-osmupdate.sh
+  volumes:
+   - ./import:/data/import
   environment:
      OSM_UPDATE_BASEURL: "http://download.geofabrik.de/europe/liechtenstein-updates/"
 import-labels:

src/import-osm/import-osmupdate.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -o errexit
+set -o pipefail
+set -o nounset
+
+readonly IMPORT_DATA_DIR=${IMPORT_DATA_DIR:-/data/import}
+readonly OSM_UPDATE_BASEURL=${OSM_UPDATE_BASEURL:-false}
+
+function osm_update_pbf() {
+    local pbf_file="$1"
+    local latest_diffs_file="$IMPORT_DATA_DIR/latest.osc.gz"
+    cd "$IMPORT_DATA_DIR"
+    if [ "$OSM_UPDATE_BASEURL" = false ]; then
+        osmupdate "$pbf_file" "$latest_diffs_file"
+    else
+        echo "Downloading diffs from $OSM_UPDATE_BASEURL"
+        osmupdate -v \
+            "$pbf_file" "$latest_diffs_file" \
+            --base-url="$OSM_UPDATE_BASEURL"
+    fi
+}
+
+function main() {
+    if [ "$(ls -A $IMPORT_DATA_DIR/*.pbf 2> /dev/null)" ]; then
+        local pbf_file
+        for pbf_file in "$IMPORT_DATA_DIR"/*.pbf; do
+            osm_update_pbf "$pbf_file"
+        done
+    else
+        echo "No PBF files for downloading changes."
+        echo "Please mount the $IMPORT_DATA_DIR volume to a folder containing the latest imported OSM PBF file."
+        exit 404
+    fi
+}
+
+main

src/import-osm/import.sh

@@ -11,8 +11,6 @@ readonly OSM_DB=${OSM_DB:-osm}
 readonly OSM_USER=${OSM_USER:-osm}
 readonly OSM_PASSWORD=${OSM_PASSWORD:-osm}
 
-readonly OSM_UPDATE_BASEURL=${OSM_UPDATE_BASEURL:-false}
-
 readonly DB_SCHEMA=${OSM_SCHEMA:-public}
 readonly DB_HOST=$DB_PORT_5432_TCP_ADDR
 readonly PG_CONNECT="postgis://$OSM_USER:$OSM_PASSWORD@$DB_HOST/$OSM_DB"