diff --git a/.travis.yml b/.travis.yml index c92e5e1174..2fe0d9eba4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,6 @@ jobs: language: ruby rvm: 2.5.5 env: - - CONTAINERD_VERSION=1.2.10-3 - - DOCKER_VERSION=19.03.5~3-0 - DOCKER_BUILD_FLAGS="--progress plain" - DOCKER_COMPOSE_VERSION=1.25.0-rc2 before_install: | @@ -34,21 +32,15 @@ jobs: OS_ARCH=$(uname --machine) PKG_ARCH=$(dpkg --print-architecture) OS_RELEASE=$(lsb_release -cs) - # `uname --kernel-name` sudo rm /usr/local/bin/docker-compose - curl --location https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-${OS_RELEASE}-${OS_ARCH} > docker-compose + curl --location https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname --kernel-name`-${OS_ARCH} > docker-compose chmod +x docker-compose sudo mv docker-compose /usr/local/bin - # sudo apt-get update && sudo apt-get install -y libseccomp2 - # containerd.io - wget https://download.docker.com/linux/ubuntu/dists/${OS_RELEASE}/pool/stable/${PKG_ARCH}/containerd.io_${CONTAINERD_VERSION}_${PKG_ARCH}.deb - sudo apt install ./containerd.io_${CONTAINERD_VERSION}_${PKG_ARCH}.deb - # docker-ce-cli - wget https://download.docker.com/linux/ubuntu/dists/${OS_RELEASE}/pool/stable/${PKG_ARCH}/docker-ce-cli_${DOCKER_VERSION}~ubuntu-${OS_RELEASE}_${PKG_ARCH}.deb - sudo apt install ./docker-ce-cli_${DOCKER_VERSION}~ubuntu-${OS_RELEASE}_${PKG_ARCH}.deb - # docker-ce - wget https://download.docker.com/linux/ubuntu/dists/${OS_RELEASE}/pool/stable/${PKG_ARCH}/docker-ce_${DOCKER_VERSION}~ubuntu-${OS_RELEASE}_${PKG_ARCH}.deb - sudo apt install ./docker-ce_${DOCKER_VERSION}~ubuntu-${OS_RELEASE}_${PKG_ARCH}.deb + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=${PKG_ARCH}] https://download.docker.com/linux/ubuntu $OS_RELEASE stable" + sudo apt-get update + #sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce + sudo apt-get -y install docker-ce # {"registry-mirrors": ["https://mirror.gcr.io"]} causes failures for BuildKit sudo cat /etc/docker/daemon.json sudo rm -f /etc/docker/daemon.json