Revert "minor fixes"

This reverts commit 24c3ae1.
qgis · Sep 16, 2017 · e8bd70b · e8bd70b
1 parent 5b84479
commit e8bd70b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.docker/docker-build-test.sh → .ci/travis/linux/docker-build-test.sh b/.docker/docker-build-test.sh → .ci/travis/linux/docker-build-test.sh
diff --git a/.docker/Dockerfile-build-test b/.docker/Dockerfile-build-test
@@ -2,10 +2,7 @@
 FROM      qgis/qgis3-build-deps:current_build
 MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
+RUN ls /root/.ccache
 
-
-COPY . /root/QGIS
-
-
-
-RUN /root/QGIS/.docker/docker-build-test.sh
+RUN echo "DDDD"
+RUN /root/QGIS/.ci/travis/linux/docker-build-test.sh
diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml
@@ -3,16 +3,18 @@ services:
   postgres:
     image: kartoza/postgis:9.5-2.2
     environment:
-      - ALLOW_IP_RANGE=172.18.0.0/16
+      - ALLOW_IP_RANGE="172.18.0.0/16"
 
   qgis-build-and-test:
     build:
-      context: ..
-      dockerfile: .docker/Dockerfile-build-test
-    # tty: true
+      context: .
+      dockerfile: Dockerfile-build-test
+      args:
+        DOCKER_TAG: ${DOCKER_TAG}
+    tty: true
     image: qgis/qgis3-run:${DOCKER_TAG}
     volumes:
-      - ${TRAVIS_BUILD_DIR}:/root/QGIS-host
+      - ${TRAVIS_BUILD_DIR}:/root/QGIS
       - $HOME/.ccache:/root/.ccache  # if changed, also change env var
     links:
       - postgres