Skip to content
Permalink
Browse files

Revert "minor fixes"

This reverts commit 24c3ae1.
  • Loading branch information
3nids authored and m-kuhn committed Sep 26, 2017
1 parent 6325c8d commit a2d18e051ebd3c0dfd94eac443041da8d539afd2
File renamed without changes.
@@ -2,10 +2,7 @@
FROM qgis/qgis3-build-deps:current_build
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>

RUN ls /root/.ccache


COPY . /root/QGIS



RUN /root/QGIS/.docker/docker-build-test.sh
RUN echo "DDDD"
RUN /root/QGIS/.ci/travis/linux/docker-build-test.sh
@@ -3,16 +3,18 @@ services:
postgres:
image: kartoza/postgis:9.5-2.2
environment:
- ALLOW_IP_RANGE=172.18.0.0/16
- ALLOW_IP_RANGE="172.18.0.0/16"

qgis-build-and-test:
build:
context: ..
dockerfile: .docker/Dockerfile-build-test
# tty: true
context: .
dockerfile: Dockerfile-build-test
args:
DOCKER_TAG: ${DOCKER_TAG}
tty: true
image: qgis/qgis3-run:${DOCKER_TAG}
volumes:
- ${TRAVIS_BUILD_DIR}:/root/QGIS-host
- ${TRAVIS_BUILD_DIR}:/root/QGIS
- $HOME/.ccache:/root/.ccache # if changed, also change env var
links:
- postgres

0 comments on commit a2d18e0

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