3a8fff964c
Merge branch 'release' into merge_release_v0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 09:54:15 -08:00
fe6406b0f2
Merge pull request #3916 from crosbymichael/bump_v0.8.0
...
Bump to v0.8.0
2014-02-05 12:49:41 -05:00
880dc34c0e
Merge pull request #3933 from proppy/patch-1
...
docs/installation/google: remove -mtu flag
2014-02-04 17:24:18 -08:00
650200239b
docs/installation/google: remove -mtu flag
2014-02-04 17:19:05 -08:00
cc3a8c8d8e
Bump to version 0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-04 16:08:57 -08:00
501d0499f8
Merge pull request #3928 from metalivedev/fixheadings
...
Fixes headings in Table of Contents, link from FAQ.
2014-02-04 14:59:24 -08:00
fa0afe89ad
Merge pull request #3929 from ostezer/master
...
mac-installation-docs: Update the installation dir.
2014-02-04 14:51:05 -08:00
5a49fba15e
Merge pull request #3927 from tianon/release-checklist-mention-contributors
...
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
2014-02-04 14:46:41 -08:00
aed37e70b9
mac-installation-docs: Update the installation dir.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-02-05 00:44:55 +02:00
18b896e0f0
Fixes headings in Table of Contents, link from FAQ.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-04 14:16:27 -08:00
9fbb134d87
Merge pull request #3926 from tianon/update-mailmap
...
Update .mailmap and AUTHORS
2014-02-04 13:33:41 -08:00
bd85631ca5
Update .mailmap and AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-04 13:40:56 -07:00
3455c6f470
Merge pull request #3918 from ostezer/master
...
docs: Requirements And Installation on Mac OS X 10.6 Snow Leopard
2014-02-04 12:38:51 -08:00
bac7e741bf
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-04 13:34:24 -07:00
a9b325e5b0
docs: Installation on Mac OS X 10.6 Snow Leopard
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-02-04 22:26:06 +02:00
81b2940c89
Merge pull request #3254 from shykes/onbuild
...
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
2014-02-04 11:38:27 -08:00
ded9e0d6df
builder: clearly display ONBUILD triggers during a build.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 19:11:56 +00:00
6ed7461eac
Merge pull request #3557 from unclejack/improve_vagrantfile
...
improve the Vagrant VMs: bump RAM to 512 MB & correct forwarded ports
2014-02-04 10:23:52 -08:00
495135b68a
Merge pull request #3922 from jpoimboe/iptables-public-dest-port-fix
...
iptables: use dest_addr and dest_port for public port FORWARD rule
2014-02-04 10:06:43 -08:00
23959e6cf8
Merge pull request #3919 from SvenDowideit/missing-quote
...
missing quote quota
2014-02-04 10:03:26 -08:00
ea63ade772
iptables: use dest_addr and dest_port for public port FORWARD rule
...
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-02-04 11:32:50 -06:00
297001f515
improve the Vagrant VMs
...
This bumps the VM memory and corrects forwarded ports when they're used
already.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-04 12:26:14 +02:00
3fda1819ee
Merge pull request #3920 from SvenDowideit/hack-spelling
...
Fix hack/MAINTAINERS.md spelling problems
2014-02-03 21:34:51 -08:00
df4682907d
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-04 15:32:19 +10:00
64426c74f2
missing quote quota
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-04 15:29:47 +10:00
cb0ac55b5b
Merge pull request #3897 from sandaya/master
...
Update mkimage-arch.sh to set proper permissions on rootfs directory
2014-02-03 18:42:58 -08:00
736bf3f7e6
Update mkimage-arch.sh
...
mktemp creates a root directory ("/") with permissions set to 700. Default should be 755 so other users in the container can access its subdirs (e.g http user for nginx for /srv/http/test/index.html).
Docker-DCO-1.1-Signed-off-by: Samuel Andaya <samuel@andaya.net > (github: sandaya)
2014-02-03 21:26:47 -05:00
9f994c9646
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 01:31:19 +00:00
a51f5a287b
Builder: extract the execution of a single build step into buildFile.BuildStep
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 01:23:01 +00:00
b5d6208ccf
Merge pull request #3915 from crosbymichael/no-double-put
...
No no put put
2014-02-03 16:40:44 -08:00
b56440fa24
Merge pull request #3887 from proppy/detect-network-mtu
...
docker: detect defaultNetworkMtu from default route
2014-02-03 16:35:15 -08:00
5fcd4efd26
Merge pull request #3188 from keyvanfatehi/vagrant-port-forwarding-list
...
Vagrantfile port forwarding made more flexible (w/ comments)
2014-02-03 16:29:47 -08:00
02fdc194fc
Fix unmounts out of container export funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 16:14:16 -08:00
d277a4c0f8
Do not call Put twice and do not call it on defer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 16:14:02 -08:00
8beca66741
Merge pull request #3883 from metalivedev/fix-3879
...
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
2014-02-03 16:09:54 -08:00
d8718e435d
Vagrantfile port forwarding usages documented. Added usage via envvar FORWARD_PORTS for custom port or list of comma-separated ports
...
Docker-DCO-1.1-Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com > (github: keyvanfatehi)
2014-02-03 16:07:52 -08:00
fca2f3e742
Updated width to 815 per comment.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-03 16:06:29 -08:00
ab1482e9c2
docs/cli: add mtu option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 16:01:38 -08:00
92e61f89aa
docker/config: update -mtu flag default
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 15:36:39 -08:00
1b9c5edc6c
networkdriver: add ErrNoDefaultRoute
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 14:27:59 -08:00
4e9164ff5f
Merge pull request #3908 from crosbymichael/fix-login-prompt
...
Fix login prompt on push and pull because of error message
2014-02-03 14:19:14 -08:00
a9860d8553
Merge pull request #3911 from crosbymichael/fix-remove-volume
...
Fix comparing binds and volume ids from other containers
2014-02-03 14:03:57 -08:00
720c5774e9
Fix comparing binds and volume ids from other containers
...
Currently comparing volume ids for binds and other containers are broken
Fixes #3749
Fixes #3885
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 13:18:10 -08:00
0fa9199f78
Fix login prompt on push and pull because of error message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 11:38:34 -08:00
88d66600b3
Merge pull request #3906 from tianon/unprefix-ubuntu
...
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
2014-02-03 10:28:50 -08:00
f4a7c43776
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
...
Everyone probably wants to run `docker pull ubuntu` before building with this change.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-03 11:08:35 -07:00
6863145148
Merge pull request #3904 from alexlarsson/fix-docker-commit-output
...
Fix docker commit output
2014-02-03 10:00:53 -08:00
9431b8d503
Merge pull request #3893 from tianon/clean-up-btrfs-error-messages
...
Fix several btrfs driver error messages
2014-02-03 09:51:41 -08:00
fb796900fb
Merge pull request #3892 from tianon/remove-btrfs-header-reference
...
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
2014-02-03 09:41:11 -08:00
f7f8e3c2b3
Fix several btrfs driver error messages
...
Several of the error messages were wrong, but not one of them was helpful, so this fixes them to include the important information (the actual error), and a correct description of which operation failed.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-03 09:12:18 -07:00
Michael Crosby