Skip to content
This repository has been archived by the owner on Nov 9, 2020. It is now read-only.

Commit

Permalink
[Documentation] Docker version update [SKIP CI] (#2045)
Browse files Browse the repository at this point in the history
  • Loading branch information
shuklanirdesh82 authored Dec 21, 2017
1 parent e166c62 commit dd758d5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 24 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Test environment typically consist of 1 ESX and 3 guest VMs running inside of t

**Note**: All 3 guest VMs can be reused to run swarm testcase by configuring swarm cluster (by making one node as master and registered others as worker nodes). It is not mandatory to create extra VM to configure swarm cluster but feel free if you would like to do so. Please make sure to set environment variables correctly as mentioned in section below.

We require ESX 6.0 and later, and a Linux VM running Docker 1.13+ enabled for plain text TCP connection, i.e.
We require ESX 6.0 and later, and a Linux VM running Docker 17.06.1+ enabled for plain text TCP connection, i.e.
Docker Daemon running with "-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock"
options. Note that both tcp: and unix: need to be present
Please check "Configuring and running Docker"
Expand Down
30 changes: 10 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,16 @@ Please check [VDVS Installation User Guide](http://vmware.github.io/vsphere-stor

## Supported Platforms

**ESXi:** 6.0 and above<br />
**Docker (Linux):** 1.12 and higher (Recommended 1.13/17.03 and above to use managed plugin)<br />
**Docker (Windows):** 1.13/17.03 and above (Windows containers mode only)
**ESXi:** 6.0U2 and above<br />
**Docker (Linux):** 17.06.1 and above to use managed plugin<br />
**Docker (Windows):** 17.06 and above (Windows containers mode only)<br />
**Guest Operating System**:
- Ubuntu 14.04 or higher (64 bit)
- Needs Upstart or systemctl to start and stop the service
- Needs [open vm tools or VMware Tools installed](https://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=340) ```sudo apt-get install open-vm-tools```
- RedHat 6.9 or higher (64 bit)
- Windows Server 2016 (64 bit)
- [Photon 1.0, Revision 2](https://github.com/vmware/photon/wiki/Downloading-Photon-OS#photon-os-10-revision-2-binaries) (v4.4.51 or later), [Photon 2.0](https://github.com/vmware/photon/wiki/Downloading-Photon-OS#photon-os-20-ga-binaries)<br />

## Logging
The relevant logging for debugging consists of the following:
Expand Down Expand Up @@ -83,23 +90,6 @@ logging config format for content details.

Please refer [VDVS configuration page](http://vmware.github.io/vsphere-storage-for-docker/documentation/configuration.html) for detailed steps.

## Tested on

**VMware ESXi**:
- 6.0, 6.0U1, 6.0U2
- 6.5

**Guest Operating System**:
- Ubuntu 14.04 or higher (64 bit)
- Needs Upstart or systemctl to start and stop the service
- Needs [open vm tools or VMware Tools installed](https://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=340) ```sudo apt-get install open-vm-tools```
- RedHat and CentOS
- Windows Server 2016 (64 bit)
- [Photon 1.0, Revision 2](https://github.com/vmware/photon/wiki/Downloading-Photon-OS#photon-os-10-revision-2-binaries) (v4.4.51 or later), [Photon 2.0](https://github.com/vmware/photon/wiki/Downloading-Photon-OS#photon-os-20-ga-binaries)

**Docker (Linux)**: 1.12 and higher (Recommended 1.13/17.03 and above to use managed plugin)
**Docker (Windows)**: 1.13/17.03

## References

* **Known Issues**: Please check [VDVS known issue page](http://vmware.github.io/vsphere-storage-for-docker/documentation/known-issues.html) to find out about known issues.
Expand Down
4 changes: 2 additions & 2 deletions docs/external/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Installation Result

## Installation on Linux Docker Hosts

VDVS plugin can be installed on Linux Docker hosts like any docker plugin installation. You will need docker version **1.13/17.03 or above** on the VM. In a large pool of nodes, you can push the plugin installation to multiple VM through a configuration management tool such as Ansible/Salt or using a remote shell session. The installation of plugin is really simple and we will walk through the steps to install/uninstall, enable and verify the plugin installation.
VDVS plugin can be installed on Linux Docker hosts like any docker plugin installation. You will need docker version **17.06.1 or above** on the VM. In a large pool of nodes, you can push the plugin installation to multiple VM through a configuration management tool such as Ansible/Salt or using a remote shell session. The installation of plugin is really simple and we will walk through the steps to install/uninstall, enable and verify the plugin installation.

### Dependencies

Expand Down Expand Up @@ -104,7 +104,7 @@ ID NAME DESCRIPTION ENABLED

## Installation on Windows Docker Hosts

vSphere Storage for Docker can be installed on Windows Server 2016/Windows 10 VMs using the PowerShell installer. You will need Docker EE/Docker for Windows version **1.13/17.03 or above** (with Windows containers mode enabled) on the VM.
vSphere Storage for Docker can be installed on Windows Server 2016/Windows 10 VMs using the PowerShell installer. You will need Docker EE/Docker for Windows version **17.06 or above** (with Windows containers mode enabled) on the VM.

First, start an instance of PowerShell with the "Run as administrator" option.

Expand Down
2 changes: 1 addition & 1 deletion plugin_dockerbuild/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ as a Managed Plugin, and push to dockerhub.
**Note that this is not integrated with Build or CI, which is an upcoming change**

Assuming the `Makefile` defines names as 'cnastorage/vsphere-storage-for-docker:0.12', the plugin could
be installed on Docker (1.13+) as follows:
be installed on Docker (17.06.1+) as follows:

* no question asked, and pretend the plugin name is 'vsphere' (can be used in `volume create` and `plugin rm`)
```
Expand Down

0 comments on commit dd758d5

Please sign in to comment.