ef8372387f
Merge pull request #3922 from jpoimboe/iptables-public-dest-port-fix
...
iptables: use dest_addr and dest_port for public port FORWARD rule
Upstream-commit: 495135b68ad95844b451decd9910bf7a4869c853
Component: engine
2014-02-04 10:06:43 -08:00
36c86dc9b0
Merge pull request #3919 from SvenDowideit/missing-quote
...
missing quote quota
Upstream-commit: 23959e6cf8a002c6607b692c7bd89035f59b2c39
Component: engine
2014-02-04 10:03:26 -08:00
126d36548e
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)
Upstream-commit: ea63ade772445591e78b42a36fa0dcfffa4a9f1a
Component: engine
2014-02-04 11:32:50 -06:00
79580c7340
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)
Upstream-commit: 297001f51560b1172b529a79480b02534fc53ba0
Component: engine
2014-02-04 12:26:14 +02:00
350ca55e57
Merge pull request #3920 from SvenDowideit/hack-spelling
...
Fix hack/MAINTAINERS.md spelling problems
Upstream-commit: 3fda1819ee26857e4b30d0d033fd546eab77d6b6
Component: engine
2014-02-03 21:34:51 -08:00
b5a2f94fbf
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: df4682907ddc41084bf193b863ff9da796b8e102
Component: engine
2014-02-04 15:32:19 +10:00
7de51c3acf
missing quote quota
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 64426c74f2599799bd39d04a28d43a05af7624a4
Component: engine
2014-02-04 15:29:47 +10:00
090d1571e4
Merge pull request #3897 from sandaya/master
...
Update mkimage-arch.sh to set proper permissions on rootfs directory
Upstream-commit: cb0ac55b5b9fa3eed064eea5b954ccb16b2571e7
Component: engine
2014-02-03 18:42:58 -08:00
19172f19fc
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)
Upstream-commit: 736bf3f7e6ae4a80cc85c846a4d5d074a325c9f4
Component: engine
2014-02-03 21:26:47 -05:00
eaeb410e5e
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)
Upstream-commit: 9f994c96468e2495a2dc118355b6565e7dac0f44
Component: engine
2014-02-04 01:31:19 +00:00
06516f2793
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)
Upstream-commit: a51f5a287b7b393b23e27787f090575b30cbb68a
Component: engine
2014-02-04 01:23:01 +00:00
95ec5d6cac
Merge pull request #3915 from crosbymichael/no-double-put
...
No no put put
Upstream-commit: b5d6208ccf61e1503af3ca8b577b20392fede3d6
Component: engine
2014-02-03 16:40:44 -08:00
ceeacc939a
Merge pull request #3887 from proppy/detect-network-mtu
...
docker: detect defaultNetworkMtu from default route
Upstream-commit: b56440fa2491505aa239b060faacfc12ac23d3c7
Component: engine
2014-02-03 16:35:15 -08:00
a1339728ea
Merge pull request #3188 from keyvanfatehi/vagrant-port-forwarding-list
...
Vagrantfile port forwarding made more flexible (w/ comments)
Upstream-commit: 5fcd4efd267450e6f4c44f1ce3bfc8d9067e027a
Component: engine
2014-02-03 16:29:47 -08:00
8f61d5e8bf
Fix unmounts out of container export funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 02fdc194fc726ef2ce1fa4303e121abd277f8d32
Component: engine
2014-02-03 16:14:16 -08:00
0cee6d0d01
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)
Upstream-commit: d277a4c0f811e86179770f5098b30adf065567c8
Component: engine
2014-02-03 16:14:02 -08:00
a5869c9f8d
Merge pull request #3883 from metalivedev/fix-3879
...
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
Upstream-commit: 8beca66741c74fa385fe7b8f91e7a73f4342cf90
Component: engine
2014-02-03 16:09:54 -08:00
b81da2dad7
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)
Upstream-commit: d8718e435dfab7052bfd04a1494b1ad34c33cc17
Component: engine
2014-02-03 16:07:52 -08:00
2e2c23075e
Updated width to 815 per comment.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: fca2f3e742d699688c9891ccf9dd8e58591aed08
Component: engine
2014-02-03 16:06:29 -08:00
dbbc9e5b0b
docs/cli: add mtu option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: ab1482e9c25b3c27b48d97ac84e60efb39ae8af7
Component: engine
2014-02-03 16:01:38 -08:00
0da08f6176
docker/config: update -mtu flag default
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: 92e61f89aad35c3103e0db1c6dacecc0c588bd2e
Component: engine
2014-02-03 15:36:39 -08:00
2b1dbf920f
networkdriver: add ErrNoDefaultRoute
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: 1b9c5edc6c7acbe894c4b2db3e3e4a1f1353ccc5
Component: engine
2014-02-03 14:27:59 -08:00
10838a4c46
Merge pull request #3908 from crosbymichael/fix-login-prompt
...
Fix login prompt on push and pull because of error message
Upstream-commit: 4e9164ff5f84fd9228faca5e6bbe4729b6946b14
Component: engine
2014-02-03 14:19:14 -08:00
d097de6654
Merge pull request #3911 from crosbymichael/fix-remove-volume
...
Fix comparing binds and volume ids from other containers
Upstream-commit: a9860d85530e0cb69d08cbab674fbcb503be5cc1
Component: engine
2014-02-03 14:03:57 -08:00
386288ab8c
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)
Upstream-commit: 720c5774e9a9cd510320a142848832f7cd314da7
Component: engine
2014-02-03 13:18:10 -08:00
c7f0c458df
Update lxc_template.go
...
If networking is disabled, but then pipework is used later to add nics, the network still doesn't function. Using flags=up for empty networking fixes this.
Docker-DCO-1.1-Signed-off-by: James DeFelice <james.defelice@ishisystems.com > (github: jdef)
Upstream-commit: 17c124baf6a0f3725615b22aa52ca96ac5b95326
Component: engine
2014-02-03 16:14:15 -05:00
3bf67918b9
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)
Upstream-commit: 0fa9199f781ecd27469ca192496ce7b8e24980b1
Component: engine
2014-02-03 11:38:34 -08:00
fe0650e258
Merge pull request #3906 from tianon/unprefix-ubuntu
...
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
Upstream-commit: 88d66600b3b8d71300151008c5d9eb58a799d9c9
Component: engine
2014-02-03 10:28:50 -08:00
4621ae86b1
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)
Upstream-commit: f4a7c437769b5cf25d852d1aee6a6c50ee42fc85
Component: engine
2014-02-03 11:08:35 -07:00
f8aac524dd
Merge pull request #3904 from alexlarsson/fix-docker-commit-output
...
Fix docker commit output
Upstream-commit: 686314514830547dafd7c736acee4a4a758b0ae9
Component: engine
2014-02-03 10:00:53 -08:00
23812229e0
Merge pull request #3893 from tianon/clean-up-btrfs-error-messages
...
Fix several btrfs driver error messages
Upstream-commit: 9431b8d503e1fc02e22431fded0c15e4a7dc4b0c
Component: engine
2014-02-03 09:51:41 -08:00
67cb10e065
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)
Upstream-commit: fb796900fbcd11ae63e918f91b226463619bb152
Component: engine
2014-02-03 09:41:11 -08:00
e9fcfe019f
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)
Upstream-commit: f7f8e3c2b3818d351781f96ef68432eba0fc2fda
Component: engine
2014-02-03 09:12:18 -07:00
e5c74c87ff
Merge pull request #3899 from tianon/do-not-strip-binaries
...
Update PACKAGERS.md to explicitly talk about stripping
Upstream-commit: 62aa446101bbbe9a5ad46762828d711eb9fad094
Component: engine
2014-02-03 07:08:49 -08:00
52ef7a7013
Fix docker commit output
...
The id is returned as Id, not ID, so print the right thing.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: b61c1d0d42777023a6248c6e9de4bb4877a1857b
Component: engine
2014-02-03 14:59:09 +01:00
f2667b61da
Update PACKAGERS.md to explicitly talk about stripping, quoting Dave Cheney from Golang upstream (who is very, very adamant about not stripping Golang compiled binaries)
...
While there, remove the now-outdated section about `CGO_ENABLED=0`
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 7ffd2b0785529b0b71bec90c8468dc3cb4b37525
Component: engine
2014-02-02 22:47:42 -07:00
6732035ba0
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
...
This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6922f1be08111d889b0585b763b08f92d7a55e05
Component: engine
2014-02-01 23:23:33 -07:00
67b7b510b9
docker: detect defaultNetworkMtu from default route
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
Upstream-commit: 4d0a026c98721da874a03f5b6993045bae95842a
Component: engine
2014-02-01 03:46:37 -08:00
0e1ea1b204
Consolidate a bunch of the supplementary-groups tests to cut down on the number of RUN lines in a single Dockerfile within TestBuild
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e8963748fca208e6015e3cb7981fc0bf07929e3e
Component: engine
2014-01-31 20:15:24 -07:00
57b57cdf8c
Use type switch instead of reflection
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 4ffc52385cec66cbd930bc6b5ab828ed65f43dbb
Component: engine
2014-01-31 20:15:24 -07:00
1ed42315f3
Move UserLookup functionality into a separate pkg/user submodule that implements proper parsing of /etc/passwd and /etc/group, and use that to add support for "docker run -u user:group" and for getting supplementary groups (if ":group" is not specified)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: ee93f6185be3ae73c16cf41ae397bae3ce2f6c55
Component: engine
2014-01-31 20:15:24 -07:00
a5ec5d6bb6
Merge pull request #3832 from jlhawn/3831-auth-tests-server-address
...
Prevent Tests from creating users on Prod Index
Upstream-commit: a446b347199b3b19abf06e2ccf115d926917620f
Component: engine
2014-01-31 18:34:13 -08:00
8b69044d5c
Merge pull request #3881 from crosbymichael/no-all-number
...
Do not generate all numberic truncated ids
Upstream-commit: c9f6e446eedce31c8fde15f8b198069546be3125
Component: engine
2014-01-31 18:07:01 -08:00
7b2e0fd00d
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: b0f4ad431d79869111cfbf506a783a275c274c68
Component: engine
2014-01-31 18:02:45 -08:00
31578849e3
Merge pull request #3868 from 1uptalent/3867-allow-pax-global-extended-headers-to-passthrough
...
FIX 3867 allow pax global extended headers to passthrough
Upstream-commit: f9b4146ad48f992d17ca8aa530ab5bef75400c31
Component: engine
2014-01-31 17:54:08 -08:00
b5105f20b1
Do not generate all numberic truncated ids
...
Fixes #3869
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 9b7054fd0bc707f7f8e5c9ed9ada5a1664a19a34
Component: engine
2014-01-31 17:37:13 -08:00
85b3df31cc
Merge pull request #3880 from vieux/fix_docker_login
...
fix docker login
Upstream-commit: 87c14039481e69add8c1cc2be70c41e23b6a8d31
Component: engine
2014-01-31 17:31:27 -08:00
1ec7d7b519
Merge pull request #3882 from vieux/fix_compat_api
...
fix api with old version
Upstream-commit: 31ee45e6aecd42f187a25d401ec2488f70e2b332
Component: engine
2014-01-31 17:25:39 -08:00
284cf5fe96
fix api with old version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e43236c78ae8a466a36c323aa679ea581b42cdc5
Component: engine
2014-02-01 01:24:39 +00:00
47dc263009
Merge pull request #3872 from crosbymichael/network-driver
...
Remove networking out of core and into a driver
Upstream-commit: 819c2e3ecaaa1f82401fe76bae1715183426c3cf
Component: engine
2014-01-31 17:22:37 -08:00
