Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
more fixes
  • Loading branch information
3nids authored and m-kuhn committed Sep 16, 2017
1 parent d36e5b8 commit e0d198f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .ci/travis/linux/before_script.sh
Expand Up @@ -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)
Expand All @@ -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 changes: 1 addition & 3 deletions .docker/Dockerfile-build-test
@@ -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
Expand Down

0 comments on commit e0d198f

Please sign in to comment.