Skip to content
Permalink
Browse files

more fixes

  • Loading branch information
3nids authored and m-kuhn committed Aug 13, 2017
1 parent 31b7cb1 commit 85b05ea4026614ff4d2dee7a6b4fd5e761982dd5
Showing with 3 additions and 4 deletions.
  1. +2 −1 .ci/travis/linux/before_script.sh
  2. +1 −3 .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,5 +30,6 @@ 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,7 +1,5 @@

ARG DOCKER_TAG=latest

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

RUN ls /root/.ccache

0 comments on commit 85b05ea

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