Skip to content

Commit ce109ea

Browse files
3nidsm-kuhn
authored andcommitted
Revert "use second Dockerfile to push 2nd image"
This reverts commit 050682a.
1 parent 71042b9 commit ce109ea

File tree

7 files changed

+25
-18
lines changed

7 files changed

+25
-18
lines changed

.ci/travis/linux/before_script.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ set -e
1818
pushd .docker
1919

2020
docker --version
21+
docker-compose --version
22+
docker-compose -f $DOCKER_COMPOSE config
2123
#docker pull ubuntu:16.04
2224
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
23-
docker build --file Dockerfile-deps \
24-
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
25-
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
25+
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" .
2626
# image should be pushed even if QGIS build fails
2727
# but push is achieved only on branches (not for PRs)
2828
if [[ $DOCKER_PUSH =~ true ]]; then

.ci/travis/linux/docker-build-test.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
set -e
3+
#set -e
44

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

1515
cd /root/QGIS
1616

17-
sleep 20
17+
#sleep 20
1818

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

52+
ls -la --full-time python/plugins/processing/tests/testdata/expected/polys_centroid.*
53+
5254
ninja
5355

54-
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
56+
python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -R ProcessingQgisAlgorithmsTest -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
57+
58+
find / -iname "*.shp"
59+
60+
#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
5561

5662
ccache -s
5763

.ci/travis/linux/install.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@
1212
# (at your option) any later version. #
1313
# #
1414
###########################################################################
15+
16+
shopt -s expand_aliases
17+
alias python=python3

.ci/travis/linux/script.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
2121

2222
mkdir -p $CCACHE_DIR
2323

24-
docker-compose --version
25-
docker-compose -f $DOCKER_COMPOSE config
26-
docker-compose -f $DOCKER_COMPOSE run --rm qgis-build-and-test
24+
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps
2725

2826
popd

.docker/Dockerfile-deps renamed to .docker/Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
FROM ubuntu:16.04
32
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
43

@@ -102,3 +101,10 @@ ENV QT_SELECT=5
102101
# RUN cmake --version
103102
# RUN ${CC} --version
104103
# RUN ${CXX} --version
104+
105+
# RUN locale-gen en_US.UTF-8
106+
# ENV LANG=en_US.UTF-8
107+
# ENV LANGUAGE=en_US:en
108+
# ENV LC_ALL=en_US.UTF-8
109+
110+
CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh

.docker/docker-compose.travis.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,15 @@ services:
55
environment:
66
- ALLOW_IP_RANGE="172.18.0.0/16"
77

8-
qgis-build-and-test:
9-
build:
10-
context: .
11-
dockerfile: Dockerfile-build-test
12-
args:
13-
DOCKER_TAG: ${DOCKER_TAG}
8+
qgis-deps:
149
tty: true
15-
image: qgis/qgis3-run:${DOCKER_TAG}
10+
image: qgis/qgis3-build-deps:${DOCKER_TAG}
1611
volumes:
1712
- ${TRAVIS_BUILD_DIR}:/root/QGIS
1813
- $HOME/.ccache:/root/.ccache # if changed, also change env var
1914
links:
2015
- postgres
2116
environment:
22-
- DOCKER_TAG=${DOCKER_TAG}
2317
- CCACHE_DIR=/root/.ccache
2418
- CTEST_BUILD_DIR=/root/QGIS
2519
- TRAVIS_BRANCH=${TRAVIS_BRANCH}
1 Byte
Binary file not shown.

0 commit comments

Comments
 (0)