Skip to content
Permalink
Browse files

Revert "some fixes"

This reverts commit e6657df.
  • Loading branch information
3nids committed Aug 15, 2017
1 parent 5aef668 commit c411284dcedf256998e9a97fe741b279235bd685
@@ -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 Dockerfile-deps \
docker build --file deps-Dockerfile \
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
# image should be pushed even if QGIS build fails

This file was deleted.

@@ -1,4 +1,5 @@


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

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

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

0 comments on commit c411284

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