Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 31b7cb1

Browse files
3nidsm-kuhn
authored andcommittedSep 15, 2017
some fixes
1 parent 5c69495 commit 31b7cb1

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed
 

‎.ci/travis/linux/before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pushd .docker
2020
docker --version
2121
#docker pull ubuntu:16.04
2222
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
23-
docker build --file deps-Dockerfile \
23+
docker build --file Dockerfile-deps \
2424
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
2525
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
2626
# image should be pushed even if QGIS build fails

‎.docker/Dockerfile-build-test

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
ARG DOCKER_TAG=latest
3+
4+
FROM qgis/qgis3-build-deps:$DOCKER_TAG
5+
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
6+
7+
RUN ls /root/.ccache
8+
9+
RUN echo "DDDD"
10+
RUN /root/QGIS/.ci/travis/linux/docker-build-test.sh

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11

2-
32
FROM ubuntu:16.04
43
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
54

@@ -20,6 +19,7 @@ RUN apt-get update \
2019
dh-python \
2120
flex \
2221
gdal-bin \
22+
git \
2323
graphviz \
2424
grass-dev \
2525
libexpat1-dev \
@@ -102,5 +102,3 @@ ENV QT_SELECT=5
102102
# RUN cmake --version
103103
# RUN ${CC} --version
104104
# RUN ${CXX} --version
105-
106-
RUN apt-get install -y git

‎.docker/docker-compose.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ services:
88
qgis-build-and-test:
99
build:
1010
context: .
11-
dockerfile: build-Dockerfile
11+
dockerfile: Dockerfile-build-test
12+
args:
13+
DOCKER_TAG: ${DOCKER_TAG}
1214
tty: true
1315
image: qgis/qgis3-run:${DOCKER_TAG}
1416
volumes:

0 commit comments

Comments
 (0)
Please sign in to comment.