*/README.md: Replace '-name' with '--name' and '-link' with '--link'

Docker has adopted GNU-style long options with v0.8.0 :) [1]:

  First step toward getopt style flags:

  As we keep compatibility with flags like -dns we can't have -i -t ->
  -it but at least - and -- are now correct.

[1]: https://github.com/dotcloud/docker/pull/3322
     e71dbf4 (update commands.go, 2013-12-23)

diff --git a/docker-registry/README.md b/docker-registry/README.md
index fb3a1546c947778531f7fa5fe72bedbfbe14c028..7341545742692f016a08701dcdace1c9c08a6630 100644 (file)
--- a/docker-registry/README.md
+++ b/docker-registry/README.md
@@ -1,7 +1,7 @@
 Run this [docker-registry][] image with:
 
     $ mkdir /var/lib/docker-registry
-    $ docker run -d -name docker-registry \
+    $ docker run -d --name docker-registry \
     >   -v /var/lib/docker-registry:/tmp/registry \
     >   -p 5000:5000 wking/docker-registry
 

diff --git a/elasticsearch/README.md b/elasticsearch/README.md
index 99a63f35bee0c5fff57ff4ed946e632e9cae983a..0315b0b17d087d278da472b0cef027b9b3987765 100644 (file)
--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@@ -1,14 +1,14 @@
 Run this [Elasticsearch][] image with:
 
-    $ docker run -d -name elasticsearch-0 wking/elasticsearch
+    $ docker run -d --name elasticsearch-0 wking/elasticsearch
 
 Then [link][linking] to it from your client container:
 
-    $ docker run -link elasticsearch-0:elasticsearch your-client
+    $ docker run --link elasticsearch-0:elasticsearch your-client
 
 For example, we can use the Gentoo client:
 
-    $ docker run -link elasticsearch-0:elasticsearch -i -t wking/gentoo /bin/bash
+    $ docker run --link elasticsearch-0:elasticsearch -i -t wking/gentoo /bin/bash
     d30608cbc8a1 / # HOST_PORT="${ELASTICSEARCH_PORT#[a-z]*://}"
     d30608cbc8a1 / # HOST="${HOST_PORT%:[0-9]*}"
     d30608cbc8a1 / # PORT="${HOST_PORT#[0-9.]*:}"

diff --git a/kibana-azure/README.md b/kibana-azure/README.md
index 96b70c0820d05c97e55836db1b87ea6b6cf0258a..4fd94db1ca7c79a49d7ba8de1443c2ec6fea97d6 100644 (file)
--- a/kibana-azure/README.md
+++ b/kibana-azure/README.md
@@ -1,6 +1,6 @@
 Run this [Kibana][] image with:
 
-    $ docker run -d -name kibana-0 -e ELASTICSEARCH_URL=http://es.example.com:9200 -p 80:80 wking/kibana-azure
+    $ docker run -d --name kibana-0 -e ELASTICSEARCH_URL=http://es.example.com:9200 -p 80:80 wking/kibana-azure
 
 It's just like the basic `kibana` image, but it's built from my [azure
 branch][azure] with a custom default dashboard.

diff --git a/kibana/README.md b/kibana/README.md
index 57cdf12952f7a1271fccd7f25a5a2a963e9c2aa8..6b8c8e8152edce85bff6c3192269a3c7af695776 100644 (file)
--- a/kibana/README.md
+++ b/kibana/README.md
@@ -1,5 +1,5 @@
 Run this [Kibana][] image with:
 
-    $ docker run -d -name kibana-0 -e ELASTICSEARCH_URL=http://es.example.com:9200 -p 80:80 wking/kibana
+    $ docker run -d --name kibana-0 -e ELASTICSEARCH_URL=http://es.example.com:9200 -p 80:80 wking/kibana
 
 [Kibana]: http://www.elasticsearch.org/overview/kibana/

diff --git a/memcached/README.md b/memcached/README.md
index 7b27cecf2cad3987945933bf74a7b26124a4391a..212f9622aaf259282b65301730c66af91380bcac 100644 (file)
--- a/memcached/README.md
+++ b/memcached/README.md
@@ -1,6 +1,6 @@
 Run this [Memcached][] image with:
 
-    $ docker run -d -name memcached-0 -m 128m -e MEMUSAGE=118 wking/memcached
+    $ docker run -d --name memcached-0 -m 128m -e MEMUSAGE=118 wking/memcached
 
 The 10MB difference between container memory and the
 Memcached-specific `MEMUSAGE` limit gives some overhead for the
@@ -9,7 +9,7 @@ Memcached-specific `MEMUSAGE` limit gives some overhead for the
 
 Then [link][linking] to it from your client container:
 
-    $ docker run -link memcached-0:memcached your-client
+    $ docker run --link memcached-0:memcached your-client
 
 Inside your client, use the `MEMCACHED_PORT` environment variable
 (which should be something like `tcp://172.17.0.8:11211`) to configure

diff --git a/nginx-proxy/README.md b/nginx-proxy/README.md
index 109300dd655cc6ba6de6f0ce3a33e14332c657dd..41944bd1a0d1901c5a9045152d4298e87f2a5591 100644 (file)
--- a/nginx-proxy/README.md
+++ b/nginx-proxy/README.md
@@ -6,9 +6,9 @@ plaintext and [TLS][] connections, and uses [Server Name Indication
 
 Run this [Nginx][] image with:
 
-    $ docker run -d -name nginx-a -v /var/www/a.net/htdocs:/var/www/localhost/htdocs wking/nginx
-    $ docker run -d -name nginx-b -v /var/www/b.com/htdocs:/var/www/localhost/htdocs wking/nginx
-    $ docker run -d -name nginx-proxy-0 -link nginx-a:a -e A_NAME=a.com -link nginx-b:b -e B_NAME=b.net -v /etc/ssl/nginx-proxy-0:/etc/ssl/nginx -p 80:80 -p 443:443 wking/nginx-proxy
+    $ docker run -d --name nginx-a -v /var/www/a.net/htdocs:/var/www/localhost/htdocs wking/nginx
+    $ docker run -d --name nginx-b -v /var/www/b.com/htdocs:/var/www/localhost/htdocs wking/nginx
+    $ docker run -d --name nginx-proxy-0 --link nginx-a:a -e A_NAME=a.com --link nginx-b:b -e B_NAME=b.net -v /etc/ssl/nginx-proxy-0:/etc/ssl/nginx -p 80:80 -p 443:443 wking/nginx-proxy
 
 [volume-mounting][volume-mount] your certificates and keys under the
 container's `/etc/ssl/nginx`.  The `*_NAME` environment variables

diff --git a/nginx/README.md b/nginx/README.md
index 05355cc66e73e6e75f5e377c16899a9c935708ab..6bb768bf5d134b284915cec5917ea10b1e647a97 100644 (file)
--- a/nginx/README.md
+++ b/nginx/README.md
@@ -1,6 +1,6 @@
 Run this [Nginx][] image with:
 
-    $ docker run -d -name nginx-0 -v /var/www/nginx-0/htdocs:/var/www/localhost/htdocs -p 80:80 wking/nginx
+    $ docker run -d --name nginx-0 -v /var/www/nginx-0/htdocs:/var/www/localhost/htdocs -p 80:80 wking/nginx
 
 [volume-mounting][volume-mount] your content under the container's
 `/var/www/localhost/htdocs`.  You can also mount volumes from other

diff --git a/package-cache/README.md b/package-cache/README.md
index fb086a8b77fb8086d347ebcb9ff0244d2e90a7bf..3a863ec59db9f8bc70f66c222401b2e43771741b 100644 (file)
--- a/package-cache/README.md
+++ b/package-cache/README.md
@@ -1,6 +1,6 @@
 Run this [package-cache][] image with:
 
-    $ docker run -d -name package-cache-0 -v /var/cache/package-cache-0:/usr/portage -p 4000:80 wking/package-cache
+    $ docker run -d --name package-cache-0 -v /var/cache/package-cache-0:/usr/portage -p 4000:80 wking/package-cache
 
 [volume-mounting][volume-mount] your content under the container's
 `/usr/portage`.  Then setup you host firewall to intercept outgoing

diff --git a/portage/README.md b/portage/README.md
index 43a5bc90734483c9c3a1cfcb6bd39a169d9a375e..2fbac742b48ed2a66cee9ffd02f652b0886ae9d0 100644 (file)
--- a/portage/README.md
+++ b/portage/README.md
@@ -1,11 +1,11 @@
 Use volume mounts to avoid including the Portage tree in your images:
 
-    $ docker run -d -name portage wking/portage
+    $ docker run -d --name portage wking/portage
 
 This exports a [VOLUME][] which you can [mount][volumes-from] from
 another container:
 
-    $ docker run -volumes-from portage -i -t wking/gentoo /bin/bash
+    $ docker run --volumes-from portage -i -t wking/gentoo /bin/bash
     d1a49abc4b3c / # ls /usr/portage/
     app-accessibility  dev-python        mail-mta         sci-mathematics
     …
@@ -26,7 +26,7 @@ the first container:
 
 Now kill that container and spin up another one:
 
-    $ docker run -volumes-from portage -i -t wking/gentoo /bin/bash
+    $ docker run --volumes-from portage -i -t wking/gentoo /bin/bash
     187adaf8babd / # emerge -pv netcat
     …
     These are the packages that would be merged, in order:
@@ -47,7 +47,7 @@ promptings for reading the news on both `d1a49abc4b3c` and
 You can use container volumes even if their container is not running.
 For example:
 
-    $ docker run -name portage wking/portage true
+    $ docker run --name portage wking/portage true
 
 However, it may be useful to leave the container running so you don't
 remove it up by accident.

diff --git a/postgresql/README.md b/postgresql/README.md
index fd279f4235d986c90248af10111b99d3eaf2d07e..39ba232fbf53f602dc5827b43ceae899062447fb 100644 (file)
--- a/postgresql/README.md
+++ b/postgresql/README.md
@@ -1,15 +1,15 @@
 Run this [PostgreSQL][] image with:
 
-    $ docker run -d -name postgresql-0 wking/postgresql
+    $ docker run -d --name postgresql-0 wking/postgresql
 
 Then [link][linking] to it from your client container:
 
-    $ docker run -link postgresql-0:postgresql your-client
+    $ docker run --link postgresql-0:postgresql your-client
 
 For example, we can use the PostgreSQL client in the
 `wking/postgresql` image itself:
 
-    $ docker run -link postgresql-0:postgresql -i -t wking/postgresql /bin/bash
+    $ docker run --link postgresql-0:postgresql -i -t wking/postgresql /bin/bash
     94ca64e60a00 / # HOST_PORT="${POSTGRESQL_PORT#[a-z]*://}"
     94ca64e60a00 / # HOST="${HOST_PORT%:[0-9]*}"
     94ca64e60a00 / # PORT="${HOST_PORT#[0-9.]*:}"

diff --git a/redis/README.md b/redis/README.md
index 1e7e2b2321169c2f35547f4349a2c4e36f26c661..91832d3f5ab807ffd1fe3238ed239fd0dfda64eb 100644 (file)
--- a/redis/README.md
+++ b/redis/README.md
@@ -1,10 +1,10 @@
 Run this [Redis][] image with:
 
-    $ docker run -d -name redis-0 wking/redis
+    $ docker run -d --name redis-0 wking/redis
 
 Then [link][linking] to it from your client container:
 
-    $ docker run -link redis-0:redis your-client
+    $ docker run --link redis-0:redis your-client
 
 Inside your client, use the `REDIS_PORT` environment variable (which
 should be something like `tcp://172.17.0.8:6379`) to configure your

diff --git a/stunnel/README.md b/stunnel/README.md
index 7f06030771e540b3dc30545597723d51b1fb6a42..cbaaa3a2fdf9aa29605c796664f60b85b54cd7b3 100644 (file)
--- a/stunnel/README.md
+++ b/stunnel/README.md
@@ -3,8 +3,8 @@ encryption using Docker's [linking][].  You'll want to
 [volume-mount][volume-mount] your SSL keys, since you may want
 different keys in every stunnel container.
 
-    $ docker run -d -name postgresql-0 wking/postgresql
-    $ docker run -d -name postgresql-0-ssl -v /etc/postgresql-0-ssl/stunnel.pem:/etc/stunnel/stunnel.pem -link postgresql-0:server -p 5432:9999 wking/stunnel
+    $ docker run -d --name postgresql-0 wking/postgresql
+    $ docker run -d --name postgresql-0-ssl -v /etc/postgresql-0-ssl/stunnel.pem:/etc/stunnel/stunnel.pem --link postgresql-0:server -p 5432:9999 wking/stunnel
 
 [PostgreSQL][] [uses plaintext commands to initiate SSL/TLS
 encryption][SSLRequest] so you can't use `psql` to connect directly to