use second Dockerfile to push 2nd image

3nids · m-kuhn · commit 5d5ea55e574d · 2017-09-16T09:11:26.000+02:00
diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
@@ -18,11 +18,11 @@ set -e
 pushd .docker
 
 docker --version
-docker-compose --version
-docker-compose -f $DOCKER_COMPOSE config
 #docker pull ubuntu:16.04
 docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
-docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
+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
 # but push is achieved only on branches (not for PRs)
 if [[ $DOCKER_PUSH =~ true ]]; then
diff --git a/.ci/travis/linux/install.sh b/.ci/travis/linux/install.sh
@@ -12,6 +12,3 @@
 #   (at your option) any later version.                                   #
 #                                                                         #
 ###########################################################################
-
-shopt -s expand_aliases
-alias python=python3
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -21,6 +21,8 @@ docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
 
 mkdir -p $CCACHE_DIR
 
-docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
+docker-compose --version
+docker-compose -f $DOCKER_COMPOSE config
+docker-compose -f $DOCKER_COMPOSE run --rm qgis-build-and-test
 
 popd
diff --git a/.docker/deps-Dockerfile b/.docker/deps-Dockerfile
@@ -104,10 +104,3 @@ ENV QT_SELECT=5
 # RUN ${CXX} --version
 
 RUN apt-get install -y git
-
-# RUN locale-gen en_US.UTF-8
-# ENV LANG=en_US.UTF-8
-# ENV LANGUAGE=en_US:en
-# ENV LC_ALL=en_US.UTF-8
-
-CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml
@@ -5,15 +5,19 @@ services:
     environment:
       - ALLOW_IP_RANGE="172.18.0.0/16"
 
-  qgis-deps:
+  qgis-build-and-test:
+    build:
+      context: .
+      dockerfile: build-Dockerfile
     tty: true
-    image: qgis/qgis3-build-deps:${DOCKER_TAG}
+    image: qgis/qgis3-run:${DOCKER_TAG}
     volumes:
       - ${TRAVIS_BUILD_DIR}:/root/QGIS
       - $HOME/.ccache:/root/.ccache  # if changed, also change env var
     links:
       - postgres
     environment:
+      - DOCKER_TAG=${DOCKER_TAG}
       - CCACHE_DIR=/root/.ccache
       - CTEST_BUILD_DIR=/root/QGIS
       - TRAVIS_BRANCH=${TRAVIS_BRANCH}
