Skip to content
Permalink
Browse files

Revert "more fixes"

This reverts commit 1d3c4d9.
  • Loading branch information
3nids authored and m-kuhn committed Sep 26, 2017
1 parent a2d18e0 commit f8f985798dcfa474b3eaa6228343ea11a9a22f5b
Showing with 4 additions and 3 deletions.
  1. +1 −2 .ci/travis/linux/before_script.sh
  2. +3 −1 .docker/Dockerfile-build-test
@@ -21,7 +21,7 @@ docker --version
#docker pull ubuntu:16.04
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
docker build --file Dockerfile-deps \
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" \
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
# image should be pushed even if QGIS build fails
# but push is achieved only on branches (not for PRs)
@@ -30,6 +30,5 @@ if [[ $DOCKER_PUSH =~ true ]]; then
#docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:latest"
docker push "qgis/qgis3-build-deps:${DOCKER_TAG}"
fi
docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:current_build"

popd
@@ -1,5 +1,7 @@

FROM qgis/qgis3-build-deps:current_build
ARG DOCKER_TAG=latest

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

RUN ls /root/.ccache

0 comments on commit f8f9857

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