Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
use focal to build Docker images (#35897)
  • Loading branch information
3nids committed Apr 22, 2020
1 parent 6e02084 commit 58395a2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
@@ -1,4 +1,4 @@
FROM ubuntu:19.04
FROM ubuntu:20.04
MAINTAINER Denis Rouzaud <denis@opengis.ch>

LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
Expand Down Expand Up @@ -131,9 +131,9 @@ ENV LD_LIBRARY_PATH="/instantclient_19_3:${LD_LIBRARY_PATH}"

# MSSQL: client side
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
RUN curl https://packages.microsoft.com/config/ubuntu/19.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
RUN apt-get update
RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools
RUN ACCEPT_EULA=Y apt-get install -y --allow-unauthenticated msodbcsql17 mssql-tools

# Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mssql-docker/issues/163
RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen
Expand Down
23 changes: 13 additions & 10 deletions .travis.yml
Expand Up @@ -8,7 +8,7 @@ cache:
pip: true
directories:
- ${HOME}/.ccache_testing
- ${HOME}/.ccache_docker_build_disco
- ${HOME}/.ccache_docker_build_focal
- ${HOME}/.ccache_docker_build_bionic
timeout: 1000
if: NOT branch =~ /^(cherry-pick-)?backport-\d+-/ AND NOT branch =~ /-patch-\d+$/
Expand Down Expand Up @@ -116,19 +116,19 @@ matrix:
- CXX=/usr/lib/ccache/clang++

##########################################################
# DISCO DOCKER BUILD ON CRON OR TAG
# FOCAL DOCKER BUILD ON CRON OR TAG
##########################################################
- os: linux
name: disco docker build 💃
name: focal docker build
if: repo = qgis/QGIS AND (tag IS PRESENT OR type = cron)
services: docker
sudo: required # required to restart Docker Daemon with experimental features
env:
- TRAVIS_CONFIG=docker_image
- CCACHE_DIR=${HOME}/.ccache_docker_build_disco
- CCACHE_DIR=${HOME}/.ccache_docker_build_focal
- TRIGGER_PYQGIS_DOC=TRUE
- DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_disco"
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-disco.dockerfile
- DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_focal"
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-focal.dockerfile
- CC=/usr/lib/ccache/gcc
- CXX=/usr/lib/ccache/g++ # Building SIP binding freezes with Clang in Docker, maybe a SIP issue, maybe not

Expand All @@ -152,10 +152,13 @@ git:
depth: 120

notifications:
irc: "chat.freenode.net#qgis-test"
on_failure: change
on_success: change
skip_join: true
irc:
channels:
- "chat.freenode.net#qgis-test"
- "chat.freenode.net#qgis-activity"
on_failure: change
on_success: change
skip_join: true

webhooks:
urls:
Expand Down

0 comments on commit 58395a2

Please sign in to comment.