Skip to content

Commit 94e2ffe

Browse files
author
Anna Blendermann
authored
Bump docker url version to 20.10 (#970)
1 parent b7417b8 commit 94e2ffe

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Requirements
1414

1515
- [Terraform](https://www.terraform.io/downloads.html) >= 0.11.x
1616
- [Go](https://golang.org/doc/install) 1.13 to build the provider plugin
17-
- [Docker](https://docs.docker.com/install/) 17.03.x to run acceptance tests
17+
- [Docker](https://docs.docker.com/install/) 20.10.x to run acceptance tests
1818

1919
Building The Provider
2020
---------------------

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ require (
144144
replace (
145145
github.com/crewjam/saml => github.com/crewjam/saml v0.4.1
146146
github.com/docker/distribution => github.com/docker/distribution v2.7.1+incompatible
147-
github.com/docker/docker => github.com/docker/docker v20.10.6+incompatible
147+
github.com/docker/docker => github.com/docker/docker v20.10.17+incompatible
148148
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20220722231444-8b3c0513bc36
149149
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20220722085125-e464ea405677
150150
github.com/spf13/afero => github.com/spf13/afero v1.2.2

go.sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG
453453
github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
454454
github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
455455
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
456-
github.com/docker/docker v20.10.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
456+
github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
457457
github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
458458
github.com/docker/docker-credential-helpers v0.6.4/go.mod h1:ofX3UI0Gz1TteYBjtgs07O36Pyasyp66D2uKT7H8W1c=
459459
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=

scripts/gobuild_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo "==> Running dockerized build..."
66

77
# Setting docker
88
DOCKER_NAME=docker
9-
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-17.03.2-ce.tgz"
9+
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz"
1010
DOCKER_BIN=$(which ${DOCKER_NAME} || echo none)
1111
if [ "${DOCKER_BIN}" == "none" ] ; then
1212
export DOCKER_BIN=${TESTACC_TEMP_DIR}/${DOCKER_NAME}

scripts/gotestacc_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo "==> Running dockerized acceptance testing..."
66

77
# Setting docker
88
DOCKER_NAME=docker
9-
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-17.03.2-ce.tgz"
9+
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz"
1010
DOCKER_BIN=$(which ${DOCKER_NAME} || echo none)
1111
if [ "${DOCKER_BIN}" == "none" ] ; then
1212
export DOCKER_BIN=${TESTACC_TEMP_DIR}/${DOCKER_NAME}

scripts/gotestacc_vars.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ EXPOSE_HOST_PORTS=${EXPOSE_HOST_PORTS:-"false"}
1818

1919
# Setting required software
2020
DOCKER_NAME=docker
21-
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-17.03.2-ce.tgz"
21+
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz"
2222
DOCKER_BIN=$(which ${DOCKER_NAME} || echo none)
2323
if [ "${DOCKER_BIN}" == "none" ] ; then
2424
export DOCKER_BIN=${TEMP_DIR}/${DOCKER_NAME}

scripts/start_testacc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if [ "${KUBECTL_BIN}" == "none" ] ; then
5252
fi
5353
## docker
5454
DOCKER_NAME=docker
55-
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-17.03.2-ce.tgz"
55+
DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz"
5656
DOCKER_BIN=$(which ${DOCKER_NAME} || echo none)
5757
if [ "${DOCKER_BIN}" == "none" ] ; then
5858
export DOCKER_BIN=${TESTACC_TEMP_DIR}/${DOCKER_NAME}

0 commit comments

Comments
 (0)