Skip to content
Permalink
Browse files

some fixes

  • Loading branch information
3nids committed Aug 13, 2017
1 parent 050682a commit e6657df2b7ea64d340c6fd5f70640522b4bddc45
@@ -20,7 +20,7 @@ pushd .docker
docker --version
#docker pull ubuntu:16.04
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
docker build --file deps-Dockerfile \
docker build --file Dockerfile-deps \
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
# image should be pushed even if QGIS build fails
@@ -0,0 +1,10 @@

ARG DOCKER_TAG=latest

FROM qgis/qgis3-build-deps:$DOCKER_TAG
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>

RUN ls /root/.ccache

RUN echo "DDDD"
RUN /root/QGIS/.ci/travis/linux/docker-build-test.sh
@@ -1,5 +1,4 @@


FROM ubuntu:16.04
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>

@@ -20,6 +19,7 @@ RUN apt-get update \
dh-python \
flex \
gdal-bin \
git \
graphviz \
grass-dev \
libexpat1-dev \
@@ -102,5 +102,3 @@ ENV QT_SELECT=5
# RUN cmake --version
# RUN ${CC} --version
# RUN ${CXX} --version

RUN apt-get install -y git
@@ -8,7 +8,9 @@ services:
qgis-build-and-test:
build:
context: .
dockerfile: build-Dockerfile
dockerfile: Dockerfile-build-test
args:
DOCKER_TAG: ${DOCKER_TAG}
tty: true
image: qgis/qgis3-run:${DOCKER_TAG}
volumes:

0 comments on commit e6657df

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