Revert "some fixes"

This reverts commit e6657df.
qgis · Sep 15, 2017 · 06a9e993e2090d613936516ef630dc1117214b3e · 06a9e99
1 parent 5505c59
commit 06a9e993e2090d613936516ef630dc1117214b3e
Unified Split

Showing with 5 additions and 15 deletions.

+1 −1 .ci/travis/linux/before_script.sh

+0 −10 .docker/Dockerfile-build-test

+3 −1 .docker/{Dockerfile-deps → deps-Dockerfile}

+1 −3 .docker/docker-compose.travis.yml
diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
@@ -20,7 +20,7 @@ pushd .docker
 docker --version
 #docker pull ubuntu:16.04
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
-docker build --file Dockerfile-deps \
+docker build --file deps-Dockerfile \
              --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
              --tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
 # image should be pushed even if QGIS build fails

diff --git a/.docker/Dockerfile-build-test b/.docker/Dockerfile-build-test
diff --git a/.docker/Dockerfile-deps → .docker/deps-Dockerfile b/.docker/Dockerfile-deps → .docker/deps-Dockerfile
@@ -1,4 +1,5 @@
 
+
 FROM      ubuntu:16.04
 MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
@@ -19,7 +20,6 @@ RUN  apt-get update \
     dh-python \
     flex \
     gdal-bin \
-    git \
     graphviz \
     grass-dev \
     libexpat1-dev \
@@ -102,3 +102,5 @@ ENV QT_SELECT=5
 # RUN cmake --version
 # RUN ${CC} --version
 # RUN ${CXX} --version
+
+RUN apt-get install -y git
diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml
@@ -8,9 +8,7 @@ services:
   qgis-build-and-test:
     build:
       context: .
-      dockerfile: Dockerfile-build-test
-      args:
-        DOCKER_TAG: ${DOCKER_TAG}
+      dockerfile: build-Dockerfile
     tty: true
     image: qgis/qgis3-run:${DOCKER_TAG}
     volumes: