Commit Graph

20395 Commits

Author SHA1 Message Date
22dd81c469 Updated Viewing App when on OSX
Added section to show how to get IP address and view running python app if the user is using boot2docker on OSX

Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com> (github: richarvey)

Docker-DCO-1.1-Signed-off-by: Richard Harvey <richard@squarecows.com> (github: SvenDowideit)
Upstream-commit: 2c5405f699c308eee0cfc87ec6dd8aa3bce1b2ef
Component: engine
2014-06-17 10:39:11 +10:00
28dcd27f99 Merge pull request #6438 from jamtur01/opts
Fixed DOCKER_OPTS
Upstream-commit: b3e80c6935b0565cb1fafee6311a0de9abf23212
Component: engine
2014-06-17 10:16:07 +10:00
f812414977 Merge pull request #6417 from mrunalp/dev/system_prctl
Add helper function to make prctl system call.
Upstream-commit: 742d8bf922976dbf6371f198e7c6ad3b55286c90
Component: engine
2014-06-16 17:13:06 -07:00
7d55b5369e do not alter json in docker save
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3e4e8636c1b05626cae720b47ef99109077e1d3a
Component: engine
2014-06-17 00:06:21 +00:00
c4f9cd6161 Merge pull request #6240 from pmorie/docs
Add ApiVersion to doc example for remote API 1.12 /version
Upstream-commit: 8f6162f17ba6684641312526b2bfd8b39607b714
Component: engine
2014-06-17 09:21:21 +10:00
10692d0667 Merge pull request #6306 from mheon/fix_manpage_issue
Update documentation for docker pull
Upstream-commit: d5f7b4df1b96a49fe1523daec48a01f2c1cafa3e
Component: engine
2014-06-17 09:13:29 +10:00
2ebe66f88a Merge pull request #6459 from ostezer/issue-5036-main-nav-top-level-click
Issue #5036 -> Click on nav bar goes to top level doc
Upstream-commit: 95ca361df6b1c2aab3fb8edd19a81ab6b1ad0138
Component: engine
2014-06-17 09:08:37 +10:00
833bf1f98e Merge pull request #6449 from timthelion/host-net-docs
Document the potential insecurity of --net host
Upstream-commit: 4e2cf53f4fe39aac24ad23c02664daf8bf4fb568
Component: engine
2014-06-17 09:06:27 +10:00
4d16453ae7 Merge pull request #6430 from LK4D4/lock_inspect
Do inspect under container lock
Upstream-commit: d671768b52a43f27755d10245917103dea6b7416
Component: engine
2014-06-16 15:31:08 -07:00
86a79a73e0 update MAINTAINERS files
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 06248d745a6a69b14595a699e0e5b3e883d8ea3a
Component: engine
2014-06-16 22:20:07 +00:00
0701888e65 Issue #5036 -> Click on nav bar goes to top level doc
Closes issue #5036

This commit redirects the reader to top level doc upon clicking
on a main nav. menu item (eg. Installation [click] -> Mac OS X)

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 8ae966de75fade55da5e34bd65b83c8ceb27346b
Component: engine
2014-06-16 13:51:56 -07:00
4c39400bd1 Document the potential insecurity of --net host
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: https://github.com/timthelion)
Upstream-commit: ed5054389aa7cd0456bfdf1d940d3cdad0313f8f
Component: engine
2014-06-16 20:40:07 +00:00
5a4f568984 Issue #5279 -> Introduce horizontal scrolling to code-blocks
Closes issue #5279

This commit re-introduces horizontal scrolling to docs' codeblocks

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 7a7bb43db5ecea4dd08af016a2528d0722bf79ac
Component: engine
2014-06-16 13:29:20 -07:00
65a88a1593 Updated CLI documentation for docker pull with notes on specifying URL
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 03ae463c8d77dd8d10e9fd9e37d984896ef9247e
Component: engine
2014-06-16 15:58:05 -04:00
203a0f3ec5 Merge pull request #6425 from tianon/fix-man-page-spelling-errors
Fix several man page spelling errors
Upstream-commit: a6ce867e48cdfaafdca7344bd2df9c29cdd20cbe
Component: engine
2014-06-16 13:24:10 -06:00
0bc0d4e474 Updated docker pull manpage to reflect ability to specify URL of registry.
Also fixed a typo in same file.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: aab9078ff976c1ee7413a6cfc1b9d6424c3581fd
Component: engine
2014-06-16 15:13:47 -04:00
bee288d0b6 Merge pull request #6304 from glyn/mac-build-no-sudo
Do not build using sudo on Mac OS X
Upstream-commit: 4e20407d8260657bc823d6d02120972d718222b3
Component: engine
2014-06-16 09:45:52 -04:00
26c642c4fd Do not build using sudo on Mac OS X
Building using sudo fails on Mac OS X, but is necessary on Linux.

See https://groups.google.com/d/topic/docker-dev/1EW_pfA1t9o/discussion for discussion.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Upstream-commit: 1c05ddd645c50102321274ec7595c8b62dd71335
Component: engine
2014-06-16 14:39:48 +01:00
76dc816a6e Guillaume is busy full-time on his new business, and no longer available
as a maintainer.

Best of luck on your e-commerce business Guillaume, and thanks for all
the great contributions!

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 41d437117d13d445192b92a93955dec5c012512c
Component: engine
2014-06-16 06:22:15 -07:00
86dabfb5d3 Merge pull request #6443 from catharsis/patch-1
dockervolumes: Fix a minor typo
Upstream-commit: 7085ec875fbfe927e555d1bdc485654682d698ab
Component: engine
2014-06-16 09:09:32 -04:00
9246d93b3c Merge pull request #6437 from jamtur01/net
Fixed headers and ' characters
Upstream-commit: 2b468dc283d1379dd7d24dbdae4de8c92b2ae9ab
Component: engine
2014-06-16 20:19:03 +10:00
b82599c74a dockervolumes: Fix a minor typo
Upstream-commit: 8df0b12d821d5a57051e9a92bc8687ac893deb3f
Component: engine
2014-06-16 09:52:23 +02:00
db3540c189 Merge pull request #6378 from evanderkoogh/patch-1
Linking containers added to API example
Upstream-commit: 50d49d0db887453b6c5483c9086cbdb68ad466d2
Component: engine
2014-06-15 20:29:50 -04:00
b025f435dc Merge pull request #6433 from soulshake/small-typos
Fix spelling and grammar errors; remove seemingly out-of-place words
Upstream-commit: 50fde602a1f1ddf3c388bf33bb02d9486e9fa7b0
Component: engine
2014-06-15 11:36:19 -07:00
9cacf9c04c docker-java has moved to new location
Upstream-commit: 520163a00ee22ddb3d689f7304db2af2784d3bdb
Component: engine
2014-06-15 20:16:51 +02:00
441ed363ff Fixed DOCKER_OPTS
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 0b97725340504b57b0abfa112746a16ba6a0d631
Component: engine
2014-06-15 12:26:52 -04:00
6e2a69bea8 Fixed headers and ' characters
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 4adab34dfa9d3e128d022522adfc95c0a47dd8e0
Component: engine
2014-06-15 12:15:59 -04:00
288f2b5878 Fix spelling and grammar errors; remove seemingly out-of-place words
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net> (github: soulshake)
Upstream-commit: be9dcbbef5961357117448976411be155daac019
Component: engine
2014-06-15 01:18:11 +02:00
99ccd1838c Fix several typos
Docker-DCO-1.1-Signed-off-by: Michael Prokop <github@michael-prokop.at> (github: mika)
Upstream-commit: c0c58b6b46626c0ae5cc9c0b37519c505f5a8484
Component: engine
2014-06-14 23:16:30 +02:00
f5efd485e9 Do inspect under container lock
It fixes some race conditions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 947405a90951e4715a8399410b67f4f644415d59
Component: engine
2014-06-14 21:08:23 +04:00
839293c4cd Fix missing leading slash for /bin/bash executable
Upstream-commit: e9f1f760f220cbd0f3df68b09ab8c10b27dfa0e9
Component: engine
2014-06-14 15:54:27 +02:00
b13aa65bb4 Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e02cf69789d12e8d44c8168e1515f43f39be6461
Component: engine
2014-06-14 01:59:52 -06:00
cb48ac70c7 Fix several man page spelling errors
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cb92c4714460aff9fc5c06c2daa3fd1474d77ef5
Component: engine
2014-06-14 01:49:51 -06:00
a5dd68c3f3 Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d561fe6d2d47b2655d8532264ea9ae20e8d20f04
Component: engine
2014-06-14 01:44:55 -06:00
61604356ac Merge pull request #6386 from cpuguy83/fix_link_docs
Adds info on how to get env vars from container
Upstream-commit: c40602b25483d7bf6e58b715717ade0ad9541b11
Component: engine
2014-06-13 23:12:32 -07:00
9ecc7d002d Fixed whitespace errors
Upstream-commit: 1a441d9aeaf929abb89958675018ebc5e0868844
Component: engine
2014-06-13 17:08:53 -07:00
1dbb9e510c Note user name and password in docs on boot2docker
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com> (github: nathanleclaire)
Upstream-commit: 073382a9c61fb73b8d1915bf53fa6e8c5bd8fbb8
Component: engine
2014-06-13 15:38:45 -07:00
407e2d7995 Add helper function to make prctl system call.
Docker-DCO-1.1-Signed-off-by: Mrunal Patel <mrunalp@gmail.com> (github: mrunalp)
Upstream-commit: 65567e125d9bd4d4ede25dd03bda11ebf1ef7321
Component: engine
2014-06-13 11:49:57 -07:00
dfd42b4d5f docs: add spotify docker-client link
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: 27b2d7ff7245ad57dcaa7f9ce8eeeee743373a85
Component: engine
2014-06-13 14:20:31 -04:00
83d64fe636 Increase time before exit in TestMultipleAttachRestart
Sometimes third attacher attaching to already stopped container.
Also I've changed prefix to attach and fixed cleanup on Fatal.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: eb97163348d88954dbacbcbc7eed71efd666dddc
Component: engine
2014-06-13 21:40:30 +04:00
fce019ee42 Fix typo
Upstream-commit: 52e88d92f0cceb9caa13160febcfe046732e0b86
Component: engine
2014-06-13 15:53:42 +02:00
946f83d348 Add support for client certificates for registries
This lets you specify custom client TLS certificates and CA root for a
specific registry hostname. Docker will then verify the registry
against the CA and present the client cert when talking to that
registry.  This allows the registry to verify that the client has a
proper key, indicating that the client is allowed to access the
images.

A custom cert is configured by creating a directory in
/etc/docker/certs.d with the same name as the registry hostname. Inside
this directory all *.crt files are added as CA Roots (if none exists,
the system default is used) and pair of files <filename>.key and
<filename>.cert indicate a custom certificate to present to the registry.

If there are multiple certificates each one will be tried in
alphabetical order, proceeding to the next if we get a 403 of 5xx
response.

So, an example setup would be:
/etc/docker/certs.d/
└── localhost
    ├── client.cert
    ├── client.key
    └── localhost.crt

A simple way to test this setup is to use an apache server to host a
registry. Just copy a registry tree into the apache root, here is an
example one containing the busybox image:
  http://people.gnome.org/~alexl/v1.tar.gz

Then add this conf file as /etc/httpd/conf.d/registry.conf:

 # This must be in the root context, otherwise it causes a re-negotiation
 # which is not supported by the tls implementation in go
 SSLVerifyClient optional_no_ca

 <Location /v1>
 Action cert-protected /cgi-bin/cert.cgi
 SetHandler cert-protected

 Header set x-docker-registry-version "0.6.2"
 SetEnvIf Host (.*) custom_host=$1
 Header set X-Docker-Endpoints "%{custom_host}e"
 </Location>

And this as /var/www/cgi-bin/cert.cgi

 #!/bin/bash
 if [ "$HTTPS" != "on" ]; then
     echo "Status: 403 Not using SSL"
     echo "x-docker-registry-version: 0.6.2"
     echo
     exit 0
 fi
 if [ "$SSL_CLIENT_VERIFY" == "NONE" ]; then
     echo "Status: 403 Client certificate invalid"
     echo "x-docker-registry-version: 0.6.2"
     echo
     exit 0
 fi
 echo "Content-length: $(stat --printf='%s' $PATH_TRANSLATED)"
 echo "x-docker-registry-version: 0.6.2"
 echo "X-Docker-Endpoints: $SERVER_NAME"
 echo "X-Docker-Size: 0"
 echo

 cat $PATH_TRANSLATED

This will return 403 for all accessed to /v1 unless *any* client cert
is presented. Obviously a real implementation would verify more details
about the certificate.

Example client certs can be generated with:

openssl genrsa -out client.key 1024
openssl req -new -x509 -text -key client.key -out client.cert

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 05243104fc0a0ef9537766cf5bd920824665eb78
Component: engine
2014-06-13 11:13:18 +02:00
5a4d61b92a Merge pull request #6214 from LK4D4/fix_some_more_race_conditions
Fix some more race conditions
Upstream-commit: 51b188c5102e86ad453c933077bcaf9594070c28
Component: engine
2014-06-12 15:17:10 -07:00
28b97cf916 Merge pull request #6391 from vieux/fix_hostname_file_net_host
fix hostname generation with --net=host
Upstream-commit: 8091157038fe582d5d674cc743c87b808036d80d
Component: engine
2014-06-12 14:11:26 -07:00
4c7bb47c22 Merge pull request #6381 from glyn/prod-ready
Remove "production ready" from the roadmap
Upstream-commit: d871725cf267e986e29fed4360b3a46a964b9bd4
Component: engine
2014-06-12 14:02:51 -07:00
dab360c397 Merge pull request #6360 from vieux/remove_beam
remove unused beam, will be back later as libchan
Upstream-commit: f9f6379a533adefddef367b9310e91c8c21c2727
Component: engine
2014-06-12 13:55:53 -07:00
e3ce3684c5 Merge pull request #6365 from vieux/allow_net_none_h
Allow --net=none and -h
Upstream-commit: 15243cdbde92018b7dc59e5d17edebe895fb0b4b
Component: engine
2014-06-12 12:26:54 -07:00
c99ab31438 add hostname generation with --net=host
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: f5979b9d0dd993a00e064114218ccdbfdaab9fe0
Component: engine
2014-06-12 19:20:57 +00:00
13764748a8 add test
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 9494643bf1fcd38974266555e59e1b2d2573c418
Component: engine
2014-06-12 19:11:51 +00:00
5591b84fff Merge pull request #6307 from W4RH4WK/master
restore logo for README.md
Upstream-commit: a8d6d28be4d1a9a5393ee7a268c964c555fc93c5
Component: engine
2014-06-12 10:21:10 -07:00