diff --git a/.travis.yml b/.travis.yml index 5f9c573c..bf99d8b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,26 @@ dist: xenial +env: + - DOCKER_COMPOSE_VERSION: 1.23.1 + addons: apt: packages: - - curl - -env: - - DOCKER_COMPOSE_VERSION: 1.23.1 + - build-essential + - nghttp2 + - libnghttp2-dev + - libssl-dev services: - docker before_install: + - wget https://curl.haxx.se/download/curl-7.63.0.tar.gz && tar xzf curl-7.63.0.tar.gz + - cd curl-7.63.0 + - sudo apt-get -y remove curl + - ./configure --with-nghttp2 --with-ssl + - make && sudo make install + - sudo ldconfig && cd .. - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update diff --git a/Dockerfile b/Dockerfile index aba98540..4a8191d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL author=frappé ENV LANG C.UTF-8 # Install all neccesary packages -RUN apt-get update && apt-get install -y --no-install-recommends build-essential cron curl git iputils-ping libffi-dev \ +RUN apt-get update && apt-get install -y --no-install-suggests --no-install-recommends build-essential cron curl git iputils-ping libffi-dev \ liblcms2-dev libldap2-dev libmariadbclient-dev libsasl2-dev libssl-dev libtiff5-dev libwebp-dev mariadb-client \ python-dev python-pip python-setuptools python-tk redis-tools rlwrap software-properties-common sudo tk8.6-dev \ vim xfonts-75dpi xfonts-base wget wkhtmltopdf \