Skip to content

Commit

Permalink
Revert "more fixes"
Browse files Browse the repository at this point in the history
This reverts commit 1d3c4d9.
  • Loading branch information
3nids committed Aug 15, 2017
1 parent 027de22 commit 5aef668
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .ci/travis/linux/before_script.sh
Original file line number Diff line number Diff line change
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,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
4 changes: 3 additions & 1 deletion .docker/Dockerfile-build-test
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 5aef668

Please sign in to comment.