feat(platform): support docker 19.03.14 (#999)

tkestack · Dec 12, 2020 · addc10c · addc10c
1 parent b1762a2
commit addc10c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/build/docker/tools/provider-res/Makefile b/build/docker/tools/provider-res/Makefile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations under the License.
 
 IMAGE = provider-res
-VERSION = v1.18.3-2
+VERSION = v1.18.3-3
 REGISTRY_PREFIX ?= tkestack
 
 COMMON_SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))

diff --git a/build/docker/tools/tke-installer/release.sh b/build/docker/tools/tke-installer/release.sh
@@ -23,9 +23,9 @@ set -o pipefail
 REGISTRY_PREFIX=${REGISTRY_PREFIX:-tkestack}
 BUILDER=${BUILDER:-default}
 VERSION=${VERSION:-$(git describe --dirty --always --tags | sed 's/-/./g')}
-PROVIDER_RES_VERSION=v1.18.3-2
+PROVIDER_RES_VERSION=v1.18.3-3
 K8S_VERSION=${PROVIDER_RES_VERSION%-*}
-DOCKER_VERSION=19.03.9
+DOCKER_VERSION=19.03.14
 OSS=(linux)
 ARCHS=(amd64 arm64)
 OUTPUT_DIR=_output

diff --git a/cmd/tke-installer/app/installer/images/images.go b/cmd/tke-installer/app/installer/images/images.go
@@ -72,7 +72,7 @@ var components = Components{
  Busybox: containerregistry.Image{Name: "busybox", Tag: "1.31.1"},
  InfluxDB: containerregistry.Image{Name: "influxdb", Tag: "1.7.9"},
 
- ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.18.3-2"},
+ ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.18.3-3"},
 
  TKEAuthAPI: containerregistry.Image{Name: "tke-auth-api", Tag: Version},
  TKEAuthController: containerregistry.Image{Name: "tke-auth-controller", Tag: Version},

diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
@@ -40,7 +40,7 @@ var (
  return "v" + s
  }).([]string)
 
- DockerVersions = []string{"19.03.9"}
+ DockerVersions = []string{"19.03.14"}
  CNIPluginsVersions = []string{"v0.8.6"}
  ConntrackToolsVersions = []string{"1.4.4"}
  NvidiaDriverVersions = []string{"440.31"}

diff --git a/web/installer/src/modules/installer/components/Step3.tsx b/web/installer/src/modules/installer/components/Step3.tsx
@@ -192,7 +192,7 @@ export class Step3 extends React.Component<RootProps> {
  <Form.Item label="docker设置">
  {this.renderArg(editState.dockerExtraArgs, 'dockerExtraArgs')}
  <Form.Text>
- 为docker(19.03.9)运行设置自定义参数，默认不需要添加，详细请参考
+ 为docker(19.03.14)运行设置自定义参数，默认不需要添加，详细请参考
  <ExternalLink href="https://docs.docker.com/engine/reference/commandline/run/">
  帮助文档
  </ExternalLink>