Skip to content
Permalink
Browse files

Revert "use second Dockerfile to push 2nd image"

This reverts commit 050682a.
  • Loading branch information
3nids authored and m-kuhn committed Sep 28, 2017
1 parent 71042b9 commit ce109eac98968c6e8c174e1229cdb0db44553f53
@@ -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 --file Dockerfile-deps \
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "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
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

set -e
#set -e

# locale-gen en_US.UTF-8
# export LANG=en_US.UTF-8
@@ -14,7 +14,7 @@ ccache -z

cd /root/QGIS

sleep 20
#sleep 20

printf "[qgis_test]\nhost=postgres\nport=5432\ndbname=qgis_test\nuser=docker\npassword=docker" > ~/.pg_service.conf
export PGUSER=docker
@@ -49,9 +49,15 @@ cmake \
export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
export CTEST_BUILD_COMMAND="/usr/bin/ninja"

ls -la --full-time python/plugins/processing/tests/testdata/expected/polys_centroid.*

ninja

python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -R ProcessingQgisAlgorithmsTest -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure

find / -iname "*.shp"

#python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure

ccache -s

@@ -12,3 +12,6 @@
# (at your option) any later version. #
# #
###########################################################################

shopt -s expand_aliases
alias python=python3
@@ -21,8 +21,6 @@ docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps

mkdir -p $CCACHE_DIR

docker-compose --version
docker-compose -f $DOCKER_COMPOSE config
docker-compose -f $DOCKER_COMPOSE run --rm qgis-build-and-test
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps

popd
@@ -1,4 +1,3 @@

FROM ubuntu:16.04
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>

@@ -102,3 +101,10 @@ ENV QT_SELECT=5
# RUN cmake --version
# RUN ${CC} --version
# RUN ${CXX} --version

# 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
@@ -5,21 +5,15 @@ services:
environment:
- ALLOW_IP_RANGE="172.18.0.0/16"

qgis-build-and-test:
build:
context: .
dockerfile: Dockerfile-build-test
args:
DOCKER_TAG: ${DOCKER_TAG}
qgis-deps:
tty: true
image: qgis/qgis3-run:${DOCKER_TAG}
image: qgis/qgis3-build-deps:${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}
Binary file not shown.

0 comments on commit ce109ea

Please sign in to comment.
You can’t perform that action at this time.