Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Revert "use second Dockerfile to push 2nd image"
- Loading branch information
|
@@ -18,11 +18,11 @@ set -e |
|
|
pushd .docker |
|
|
|
|
|
docker --version |
|
|
docker-compose --version |
|
|
docker-compose -f $DOCKER_COMPOSE config |
|
|
#docker pull ubuntu:16.04 |
|
|
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true |
|
|
docker build --file deps-Dockerfile \ |
|
|
--cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}"\ |
|
|
--tag "qgis/qgis3-build-deps:${DOCKER_TAG}" . |
|
|
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "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) |
|
|
if [[ $DOCKER_PUSH =~ true ]]; then |
|
|
|
@@ -12,3 +12,6 @@ |
|
|
# (at your option) any later version. # |
|
|
# # |
|
|
########################################################################### |
|
|
|
|
|
shopt -s expand_aliases |
|
|
alias python=python3 |
|
@@ -22,8 +22,6 @@ docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps |
|
|
|
|
|
mkdir -p $CCACHE_DIR |
|
|
|
|
|
docker-compose --version |
|
|
docker-compose -f $DOCKER_COMPOSE config |
|
|
docker-compose -f $DOCKER_COMPOSE run --rm qgis-build-and-test |
|
|
docker-compose -f $DOCKER_COMPOSE run --rm qgis-deps |
|
|
|
|
|
popd |
|
@@ -104,3 +104,10 @@ ENV QT_SELECT=5 |
|
|
# RUN ${CXX} --version |
|
|
|
|
|
RUN apt-get install -y git |
|
|
|
|
|
# RUN locale-gen en_US.UTF-8 |
|
|
# ENV LANG=en_US.UTF-8 |
|
|
# ENV LANGUAGE=en_US:en |
|
|
# ENV LC_ALL=en_US.UTF-8 |
|
|
|
|
|
CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh |
|
@@ -5,19 +5,15 @@ services: |
|
|
environment: |
|
|
- ALLOW_IP_RANGE="172.18.0.0/16" |
|
|
|
|
|
qgis-build-and-test: |
|
|
build: |
|
|
context: . |
|
|
dockerfile: build-Dockerfile |
|
|
qgis-deps: |
|
|
tty: true |
|
|
image: qgis/qgis3-run:${DOCKER_TAG} |
|
|
image: qgis/qgis3-build-deps:${DOCKER_TAG} |
|
|
volumes: |
|
|
- ${TRAVIS_BUILD_DIR}:/root/QGIS |
|
|
- $HOME/.ccache:/root/.ccache # if changed, also change env var |
|
|
links: |
|
|
- postgres |
|
|
environment: |
|
|
- DOCKER_TAG=${DOCKER_TAG} |
|
|
- CCACHE_DIR=/root/.ccache |
|
|
- CTEST_BUILD_DIR=/root/QGIS |
|
|
- TRAVIS_BRANCH=${TRAVIS_BRANCH} |
|
|