Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
correctly set working path
  • Loading branch information
3nids committed Feb 15, 2018
1 parent 3e6d164 commit f103156
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .ci/travis/linux/script.sh
Expand Up @@ -23,7 +23,11 @@ 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 .
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}"
Expand Down
2 changes: 1 addition & 1 deletion .docker/qgis.dockerfile
Expand Up @@ -13,7 +13,7 @@ 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
ENV CCACHE_DIR=/root/.ccache
Expand Down

0 comments on commit f103156

Please sign in to comment.