From fe38bc987f6a7014b8d7014042702c400f12c1dd Mon Sep 17 00:00:00 2001
From: ImreSamu <ImreSamu@users.noreply.github.com>
Date: Sat, 19 May 2018 21:18:04 +0200
Subject: [PATCH] docker: some minor fixes

---
 .dockerignore | 24 ++++++++++++++++++++++++
 .travis.yml   |  6 ++++--
 run_all.sh    |  5 +++--
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..44c8c98e
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,24 @@
+.git/*
+archive/*
+intermediate/*
+backup/*
+
+
+10m_cultural/*   
+110m_physical/*  
+archive/*     
+geojson/*       
+live/*      
+packages/* 
+x_tempshape/*
+10m_physical/*   
+50m_cultural/*   
+housekeeping/*  
+live_ne/*  
+updates/*              
+zip/*
+110m_cultural/*  
+50m_physical/*   
+tools/*      
+zips/*
+
diff --git a/.travis.yml b/.travis.yml
index ceb276b6..f597a8eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,6 +112,8 @@ matrix:
              - nedocker=YES              
           sudo: required             
           before_install:
-                - docker build -t ne_py3wikdata .
+                - docker version
+                - docker build -t ne_py3wikidata .
+                - docker images
           script:      
-                - docker run -it -v $(pwd):/ne   ne_py3wikdata  bash run_all.sh
+                - docker run -it -v $(pwd):/ne   ne_py3wikidata  bash run_all.sh
diff --git a/run_all.sh b/run_all.sh
index 85782b6f..157fe805 100755
--- a/run_all.sh
+++ b/run_all.sh
@@ -1,4 +1,5 @@
-
+#!/bin/bash
+set -Eeuo pipefail
 
 python3 ./tools/wikidata/platform_debug_info.py
 time ./tools/wikidata/update.sh fetch
@@ -6,4 +7,4 @@ time ./tools/wikidata/update.sh write
 cat   x_tempshape/update.md
 cp -r x_tempshape/10m_cultural/*    10m_cultural/
 cp -r x_tempshape/10m_physical/*    10m_physical/
-make clean all
\ No newline at end of file
+make clean all