Skip to content

Commit 9edbf1a

Browse files
3nidsm-kuhn
authored andcommitted
Revert "minor fixes"
This reverts commit 24c3ae1.
1 parent 656b61e commit 9edbf1a

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed
File renamed without changes.

.docker/Dockerfile-build-test

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
FROM qgis/qgis3-build-deps:current_build
33
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
44

5+
RUN ls /root/.ccache
56

6-
7-
COPY . /root/QGIS
8-
9-
10-
11-
RUN /root/QGIS/.docker/docker-build-test.sh
7+
RUN echo "DDDD"
8+
RUN /root/QGIS/.ci/travis/linux/docker-build-test.sh

.docker/docker-compose.travis.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ services:
33
postgres:
44
image: kartoza/postgis:9.5-2.2
55
environment:
6-
- ALLOW_IP_RANGE=172.18.0.0/16
6+
- ALLOW_IP_RANGE="172.18.0.0/16"
77

88
qgis-build-and-test:
99
build:
10-
context: ..
11-
dockerfile: .docker/Dockerfile-build-test
12-
# tty: true
10+
context: .
11+
dockerfile: Dockerfile-build-test
12+
args:
13+
DOCKER_TAG: ${DOCKER_TAG}
14+
tty: true
1315
image: qgis/qgis3-run:${DOCKER_TAG}
1416
volumes:
15-
- ${TRAVIS_BUILD_DIR}:/root/QGIS-host
17+
- ${TRAVIS_BUILD_DIR}:/root/QGIS
1618
- $HOME/.ccache:/root/.ccache # if changed, also change env var
1719
links:
1820
- postgres

0 commit comments

Comments
 (0)