Fix docker build for directory locations

[skip ci]
MacPython · Aug 7, 2017 · 6f6e9c1 · 6f6e9c1
1 parent 68652d5
commit 6f6e9c1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+gdal/.git
+multibuild/.git
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,7 @@
 FROM quay.io/pypa/manylinux1_x86_64
 MAINTAINER Matthew Brett
 
-COPY config.sh build_docker.sh gdal multibuild /io/
+COPY config.sh build_docker.sh /io/
+COPY gdal /io/gdal/
+COPY multibuild /io/multibuild
 RUN bash /io/build_docker.sh
diff --git a/config.sh b/config.sh
@@ -64,9 +64,7 @@ function stop_pings {
 
 function build_gdal {
     if [ -e gdal-stamp ]; then return; fi
-    echo "Here"
     build_zlib
-    echo "After here"
     build_curl
     build_expat
     build_sqlite3
@@ -114,12 +112,10 @@ function build_gdal {
 function pre_build {
     # Any stuff that you need to do before you start building the wheels
     # Runs in the root directory of this repository.
-    echo "In pre-build"
     build_gdal
 }
 
 function build_wheel {
-    echo "In build wheel"
     build_pip_wheel gdal/gdal/swig/python
 }
 

diff --git a/gdal b/gdal