Skip to content

/ QGIS

Permalink
Browse files

more fixes

  • Loading branch information
@3nids @m-kuhn
3nids authored and m-kuhn committed Sep 16, 2017
Unverified
The key that signed this is expired.
GPG key ID: A0E766808764D73F Learn about signing commits
1 parent d36e5b8 commit e0d198f97138e4437d4b7ed88e0ac43ac2619023
Unified Split
Showing with 3 additions and 4 deletions.
  1. +2 −1 .ci/travis/linux/before_script.sh
  2. +1 −3 .docker/Dockerfile-build-test
3 .ci/travis/linux/before_script.sh
View file
@@ -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
4 .docker/Dockerfile-build-test
View file
@@ -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 e0d198f

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