minor fixes

3nids · 3nids · commit 24c3ae15e04b · 2017-08-14T17:34:54.000+02:00
diff --git a/.docker/Dockerfile-build-test b/.docker/Dockerfile-build-test
@@ -2,7 +2,10 @@
 FROM      qgis/qgis3-build-deps:current_build
 MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
-RUN ls /root/.ccache
 
-RUN echo "DDDD"
-RUN /root/QGIS/.ci/travis/linux/docker-build-test.sh
+
+COPY . /root/QGIS
+
+
+
+RUN /root/QGIS/.docker/docker-build-test.sh
diff --git a/.docker/docker-build-test.sh b/.docker/docker-build-test.sh
diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml
@@ -3,18 +3,16 @@ 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: Dockerfile-build-test
-      args:
-        DOCKER_TAG: ${DOCKER_TAG}
-    tty: true
+      context: ..
+      dockerfile: .docker/Dockerfile-build-test
+    # tty: true
     image: qgis/qgis3-run:${DOCKER_TAG}
     volumes:
-      - ${TRAVIS_BUILD_DIR}:/root/QGIS
+      - ${TRAVIS_BUILD_DIR}:/root/QGIS-host
       - $HOME/.ccache:/root/.ccache  # if changed, also change env var
     links:
       - postgres
