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 72a0fa5

Browse files
3nidsm-kuhn
authored andcommittedSep 16, 2017
Revert "some fixes"
This reverts commit e6657df.
1 parent f85e913 commit 72a0fa5

File tree

4 files changed

+5
-15
lines changed

4 files changed

+5
-15
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 Dockerfile-deps \
23+
docker build --file deps-Dockerfile \
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: 0 additions & 10 deletions
This file was deleted.

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

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

2+
23
FROM ubuntu:16.04
34
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
45

@@ -19,7 +20,6 @@ RUN apt-get update \
1920
dh-python \
2021
flex \
2122
gdal-bin \
22-
git \
2323
graphviz \
2424
grass-dev \
2525
libexpat1-dev \
@@ -102,3 +102,5 @@ 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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ services:
88
qgis-build-and-test:
99
build:
1010
context: .
11-
dockerfile: Dockerfile-build-test
12-
args:
13-
DOCKER_TAG: ${DOCKER_TAG}
11+
dockerfile: build-Dockerfile
1412
tty: true
1513
image: qgis/qgis3-run:${DOCKER_TAG}
1614
volumes:

0 commit comments

Comments
 (0)
Please sign in to comment.