Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1d3c4d9

Browse files
committedAug 14, 2017
more fixes
1 parent e6657df commit 1d3c4d9

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed
 

‎.ci/travis/linux/before_script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ docker --version
2121
#docker pull ubuntu:16.04
2222
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
2323
docker build --file Dockerfile-deps \
24-
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\
24+
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" \
2525
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" .
2626
# image should be pushed even if QGIS build fails
2727
# but push is achieved only on branches (not for PRs)
@@ -30,5 +30,6 @@ if [[ $DOCKER_PUSH =~ true ]]; then
3030
#docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:latest"
3131
docker push "qgis/qgis3-build-deps:${DOCKER_TAG}"
3232
fi
33+
docker tag "qgis/qgis3-build-deps:${DOCKER_TAG}" "qgis/qgis3-build-deps:current_build"
3334

3435
popd

‎.docker/Dockerfile-build-test

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11

2-
ARG DOCKER_TAG=latest
3-
4-
FROM qgis/qgis3-build-deps:$DOCKER_TAG
2+
FROM qgis/qgis3-build-deps:current_build
53
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
64

75
RUN ls /root/.ccache

0 commit comments

Comments
 (0)
Please sign in to comment.