From 83f32350eab50a8e10750622a2f5cba9621b990a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 09:07:23 -0500 Subject: [PATCH 01/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fba74d0..44e8c1d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,6 @@ services: env: matrix: - - DOCKER_VERSION=1.7.1-0~trusty - - DOCKER_VERSION=1.9.1-0~trusty - - DOCKER_VERSION=1.10.1-0~trusty - - DOCKER_VERSION=1.11.1-0~trusty - DOCKER_VERSION=17.03.0~ce-0~ubuntu-trusty python: @@ -19,11 +15,13 @@ python: before_install: - ./.validateDCO - - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list' - - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - - sudo apt-get update - sudo apt-key update - - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=${DOCKER_VERSION} + - sudo apt-get install apt-transport-https ca-certificates curl gnupg-agent software-properties-common + - curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - + - sudo apt-key fingerprint 0EBFCD88 + - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" + - sudo apt-get update + - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v # might as well upgrade pip to support TLS and get rid of the warnings # sudo -H pip install --upgrade pip From 4e101a0ac6c904e44a229080e30f928572ca97cc Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 09:14:18 -0500 Subject: [PATCH 02/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 44e8c1d7..33c49e14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ before_install: - ./.validateDCO - sudo apt-key update - sudo apt-get install apt-transport-https ca-certificates curl gnupg-agent software-properties-common - - curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add - + - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo apt-key fingerprint 0EBFCD88 - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" + - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v From 6dc207182afc05fc6b0969473117ddbc44ffc5cd Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 09:56:31 -0500 Subject: [PATCH 03/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 33c49e14..3071fe04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ before_install: - sudo apt-key fingerprint 0EBFCD88 - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update + - sufo apt-get upgrade -y - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v # might as well upgrade pip to support TLS and get rid of the warnings From 6f21ce60361b4a001d5207e3dcc1864070567fc6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 09:58:46 -0500 Subject: [PATCH 04/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3071fe04..19c149ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - sudo apt-key fingerprint 0EBFCD88 - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - - sufo apt-get upgrade -y + - sudo apt-get upgrade -y - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v # might as well upgrade pip to support TLS and get rid of the warnings From 11efbd7b399b7b7028453d94a94d17312b77f2cf Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 10:05:27 -0500 Subject: [PATCH 05/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 19c149ab..7b79c666 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_install: - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo apt-key fingerprint 0EBFCD88 - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + - sudo apt-key update - sudo apt-get update - sudo apt-get upgrade -y - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} From 19c3131d6d0ed83db82adca4044c0f3cccc0202f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 10:10:54 -0500 Subject: [PATCH 06/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b79c666..adc1ec52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,11 @@ before_install: - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo apt-key fingerprint 0EBFCD88 - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 - sudo apt-key update - sudo apt-get update - - sudo apt-get upgrade -y + - sudo apt-get upgrade + #- sudo apt-get upgrade -y --allow-unauthenticated - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v # might as well upgrade pip to support TLS and get rid of the warnings From 0da4f4d73c10806b73917b59bd5d866d1060a1ed Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 10:21:50 -0500 Subject: [PATCH 07/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index adc1ec52..b5068a4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,10 +20,11 @@ before_install: - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo apt-key fingerprint 0EBFCD88 - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 - - sudo apt-key update + #- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 + #- sudo apt-key update - sudo apt-get update - - sudo apt-get upgrade + - sudo apt-get install libc6 + #- sudo apt-get upgrade #- sudo apt-get upgrade -y --allow-unauthenticated - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v From 783d0c1b13bcf948fff94ddab4d5357f52afcb52 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 10:31:20 -0500 Subject: [PATCH 08/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5068a4f..2631b0a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,11 @@ before_install: #- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 #- sudo apt-key update - sudo apt-get update - - sudo apt-get install libc6 + #- sudo apt-get install libc6 #- sudo apt-get upgrade #- sudo apt-get upgrade -y --allow-unauthenticated - - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} + #- sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} + - sudo apt-get install docker-ce=${DOCKER_VERSION} - docker -v # might as well upgrade pip to support TLS and get rid of the warnings # sudo -H pip install --upgrade pip From c827c414684a72e14c3865cb0d2841f929f7c0d1 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 10:33:26 -0500 Subject: [PATCH 09/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2631b0a6..412599ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: #- sudo apt-get upgrade #- sudo apt-get upgrade -y --allow-unauthenticated #- sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - - sudo apt-get install docker-ce=${DOCKER_VERSION} + - sudo apt-get install docker-ce - docker -v # might as well upgrade pip to support TLS and get rid of the warnings # sudo -H pip install --upgrade pip From 598e02a098f00a7225205688dded2728f3635741 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Jul 2020 10:55:27 -0500 Subject: [PATCH 10/10] updating docker repo in travis Signed-off-by: root --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 412599ef..33c49e14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,14 +20,8 @@ before_install: - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo apt-key fingerprint 0EBFCD88 - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - #- sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 - #- sudo apt-key update - sudo apt-get update - #- sudo apt-get install libc6 - #- sudo apt-get upgrade - #- sudo apt-get upgrade -y --allow-unauthenticated - #- sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - - sudo apt-get install docker-ce + - sudo apt-get -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-ce=${DOCKER_VERSION} - docker -v # might as well upgrade pip to support TLS and get rid of the warnings # sudo -H pip install --upgrade pip