correctly set working path

qgis · Feb 27, 2018 · 4a6e571 · 4a6e571
1 parent 5fae870
commit 4a6e571
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -22,8 +22,12 @@ mkdir -p $CCACHE_DIR
 if [[ $DOCKER_QGIS_IMAGE_BUILD_PUSH =~ true ]]; then
   DIR=$(git rev-parse --show-toplevel)/.docker
   pushd ${DIR}
-  echo "${bold}Building QGIS Docker image...${endbold}"
-  docker build --build-arg CACHE_DIR=/root/.ccache --cache-from "qgis/qgis:${DOCKER_TAG}" -t "qgis/qgis:${DOCKER_TAG}" -f qgis.dockerfile .
+  echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
+  docker build --build-arg CACHE_DIR=/root/.ccache \
+               --build-arg DOCKER_TAG=${DOCKER_TAG} \
+               --cache-from "qgis/qgis:${DOCKER_TAG}" \
+               -t "qgis/qgis:${DOCKER_TAG}" \
+               -f qgis.dockerfile ..
   echo "${bold}Pushing image to docker hub...${endbold}"
   docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
   docker push "qgis/qgis:${DOCKER_TAG}"

diff --git a/.docker/qgis.dockerfile b/.docker/qgis.dockerfile
@@ -2,20 +2,20 @@
 # CACHE_TAG is provided by Docker cloud
 # see https://docs.docker.com/docker-cloud/builds/advanced/
 # using ARG in FROM requires min v17.05.0-ce
-ARG CACHE_TAG=latest
-ARG CCACHE_DIR
+ARG DOCKER_TAG=latest
+ARG CACHE_DIR
 
-FROM  qgis/qgis3-build-deps:${CACHE_TAG}
+FROM  qgis/qgis3-build-deps:${DOCKER_TAG}
 MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
 ENV CC=/usr/lib/ccache/clang
 ENV CXX=/usr/lib/ccache/clang++
 ENV QT_SELECT=5
 ENV LANG=C.UTF-8
 
-COPY .. /usr/src/QGIS
+COPY . /usr/src/QGIS
 
-COPY $CACHE_DIR /root/.ccache
+COPY ${CACHE_DIR} /root/.ccache
 ENV CCACHE_DIR=/root/.ccache
 RUN ccache -M 1G
 

diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ matrix:
         - DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_PULL_REQUEST =~ false ]] && echo "true" || echo "false" )
         - DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
         # on cron job, QGIS image is built and push without testing
-        - DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
+        - DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "true" ) # TODO: else false
         - QGIS_LAST_BUILD_SUCCESS=true # TODO use API to know if last build succeed https://developer.travis-ci.com/resource/builds
         - CCACHE_DIR=${HOME}/.ccache
       dist: trusty