Merge branch 'master' into imposm3_filter_reject_require

docker-compose.yml

@@ -36,6 +36,35 @@ services:
      - ./data:/import
      - ./build:/mapping
      - cache:/cache
+  import-osmborder:
+    image: "openmaptiles/import-osmborder:0.2"
+    env_file: .env
+    links:
+    - postgres
+  import-osm-diff:
+    image: "openmaptiles/import-osm:latest"
+    env_file: .env
+    command: ./import_diff.sh
+    environment:
+      DIFF_MODE: ${DIFF_MODE}
+    links:
+    - postgres
+    volumes:
+     - ./data:/import
+     - ./build:/mapping
+     - cache:/cache
+  update-osm:
+    image: "openmaptiles/import-osm:latest"
+    env_file: .env
+    environment:
+      DIFF_MODE: ${DIFF_MODE}
+    command: ./import_update.sh
+    links:
+    - postgres
+    volumes:
+     - ./data:/import
+     - ./build:/mapping
+     - cache:/cache
   import-sql:
     image: "openmaptiles/import-sql:0.1"
     env_file: .env
@@ -59,6 +88,15 @@ services:
      - postgres:db
     ports:
      - "3000:3000"
+  generate-changed-vectortiles:
+    image: "openmaptiles/generate-vectortiles:0.1"
+    command: ./export-list.sh
+    volumes:
+    - ./data:/export
+    - ./build/openmaptiles.tm2source:/tm2source
+    links:
+    - postgres:postgres
+    env_file: .env
   generate-vectortiles:
     image: "openmaptiles/generate-vectortiles:0.1"
     volumes: