Skip to content

Commit b099e71

Browse files
committed
docs(*): remove references to DOCKER_HOST
Docker is no longer exposed via a TCP socket.
1 parent 85f7b3b commit b099e71

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io
2121
On your workstation:
2222
* Install [Vagrant v1.6+](http://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
2323
* Install the fleetctl client: Install v0.6.2 from the [fleet GitHub page](https://github.com/coreos/fleet/releases/tag/v0.6.2).
24-
* Install the Docker client if you want to run Docker commands locally (optional)
2524

2625
A single-node cluster launched with Vagrant will consume about 5 GB of RAM on
2726
the host machine. Please be sure you have sufficient free memory before
@@ -57,10 +56,9 @@ This instructs Vagrant to spin up each VM. To be able to connect to the VMs, you
5756
$ ssh-add ~/.vagrant.d/insecure_private_key
5857
```
5958

60-
Export some environment variables so you can connect to the VM using the `docker` and `fleetctl` clients on your workstation.
59+
Export `FLEETCTL_TUNNEL` so you can connect to the VM using the `fleetctl` client on your workstation.
6160

6261
```console
63-
$ export DOCKER_HOST=tcp://172.17.8.100:4243
6462
$ export FLEETCTL_TUNNEL=172.17.8.100
6563
```
6664

docs/contributing/localdev.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Prerequisites
1818
We strongly recommend using `Vagrant`_ with `VirtualBox`_ so you can
1919
develop inside a set of isolated virtual machines. You will need:
2020

21-
* Vagrant 1.5.1+
21+
* Vagrant 1.6+
2222
* VirtualBox 4.2+
2323

2424
Fork the Repository
@@ -53,12 +53,10 @@ prompted for an administrative password.
5353
deis: Running: inline script
5454
$
5555
56-
Set environment variables to have the `docker` and `fleetctl` clients on
57-
your workstation connect to the VM:
56+
Set ``FLEETCTL_TUNNEL`` so the ``fleetctl`` client on your workstation can connect to the VM:
5857

5958
.. code-block:: console
6059
61-
export DOCKER_HOST=tcp://172.17.8.100:4243
6260
export FLEETCTL_TUNNEL=172.17.8.100
6361
6462
Next, run ``make pull && make build`` to SSH into the VM, pull Deis'

0 commit comments

Comments
 (0)