819cc0a8d5
Fix #3149 : port mapping of TCP + UDP
...
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
Upstream-commit: f560b87a863916d6ea5b0bd863db654563ffa14d
Component: engine
2014-01-02 16:01:04 -08:00
0ccbdf155d
Extract cgroups utilities to own submodule.
...
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
Upstream-commit: c561212b837735213f146c2fac291f84dbcbc8c3
Component: engine
2014-01-02 17:54:57 -05:00
e353a77e4f
Merge pull request #3287 from vieux/fix_progressbar_display_push
...
fix progressbar in docker push
Upstream-commit: 81e596e27288c1dd9c48273fcd131742ef8e2d89
Component: engine
2014-01-02 13:38:11 -08:00
72d8d828d0
Merge pull request #3427 from tianon/stub-deb-init-config
...
Add stubbed and commented "/etc/default/docker" to our deb package
Upstream-commit: acfdfa81be7d0e7ec38b607dc2da06d86bb75167
Component: engine
2014-01-02 09:44:36 -08:00
f5b039d329
Check standalone header when pinging a registry server. Standalone has to be true to use basic auth (in addition to previous requirements)
...
Upstream-commit: 589515c717616f3c2e0278ad787d21b4ab07b994
Component: engine
2014-01-02 17:51:42 +01:00
d1a2c2d10e
install instructions use unprefixed fedora image
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 523f726716fa017b14647b9a70176e2639a71837
Component: engine
2014-01-02 11:29:24 -05:00
92d3a8ac6c
Add stubbed and commented "/etc/default/docker" to our deb package
...
This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.
Upstream-commit: 7fd6dcc831d28cc1ca1a5d56c9043354228f087d
Component: engine
2014-01-01 22:34:22 -07:00
9fec717a30
Upgrade VBox Guest Additions ( Fix #3425 )
...
Upstream-commit: 848f290012a06e84723cad5f9222697c367b0a61
Component: engine
2014-01-02 12:56:29 +08:00
3f7d1e5993
Merge pull request #3419 from newzealandpaul/master
...
Mac OS X command in docs for pip fixed
Upstream-commit: add97f7eb0de5264cabb4d3bfb59ef6a8e4870ba
Component: engine
2014-01-01 20:27:38 -08:00
bde96d77e1
Cleanup: runtime.getFullName is deprecated by getFullName
...
Upstream-commit: 9dd7ae4074ecfceb62c3c3eae1811c5bd018c38c
Component: engine
2014-01-02 00:06:50 +01:00
b5783c4b92
Merge pull request #3374 from tianon/fpm-license-vendor
...
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
Upstream-commit: 5f557842246eb1d83b94732754760e87416386cb
Component: engine
2014-01-01 14:42:47 -08:00
5d674e11a2
Mac OSX command for pip was incorrect
...
Upstream-commit: f3816ee024fe66a207381832bfc97ea123ec72ed
Component: engine
2014-01-02 09:52:07 +13:00
a97ab92d81
Implement suggestions
...
Upstream-commit: 0b3e153588876fdc2bddde2e9064598e26276a09
Component: engine
2014-01-01 12:28:22 +01:00
f1fad2f495
Mention lxc-checkconfig
...
This is important because the list below is not complete when one build one's own kernel. Plus it is more robust in the face of changes.
Upstream-commit: 22269894105d8553fc3608fe3f749f5001a37ca0
Component: engine
2014-01-01 00:59:47 +01:00
f320db2b17
Merge pull request #3398 from thomasleveil/bash_completion_names
...
support for container names in bash completion
Upstream-commit: c23b15b9d84ed7d9421d8946c4e0a309e12cecf3
Component: engine
2013-12-31 08:28:21 -08:00
deba21c185
support for container names in bash completion
...
Upstream-commit: 055b32e3f4adfd490449b41d0cd6bc6ad5b7466a
Component: engine
2013-12-31 11:34:23 +00:00
6beb1be2a4
Merge pull request #3355 from creack/fix_build_exit
...
Exit with code 1 in case of error for `docker build`
Upstream-commit: 907d9ce13c6a7e621ff54fe9d81e4d411031ed33
Component: engine
2013-12-30 22:14:01 -08:00
e2b7c8711c
Merge pull request #3379 from tianon/organize-contrib-syntax
...
Reorganize the syntax highlighting files in contrib under a common directory
Upstream-commit: 74d45789dda863490d81729c954eb1360fdd14fd
Component: engine
2013-12-30 21:57:19 -08:00
7494334ffd
Merge pull request #3392 from tianon/fix-install-failure
...
Fix install failure when busybox can't be downloaded
Upstream-commit: 40522c038053cf90f4035fb52a57003fd8ecf25c
Component: engine
2013-12-30 20:04:30 -08:00
261bec1666
Merge pull request #3401 from odonnellryan/patch-1
...
Swap "grep -q" with "grep > /dev/null" so that "go help" doesn't balk when the pipe closes unexpectedly (since "grep -q" closes the pipe the second it finds a match)
Upstream-commit: d5bb0ff80a3cd95ed6a3774248f3ee3561cb5f22
Component: engine
2013-12-30 18:44:23 -08:00
93593cd471
Fixes Issue #3400
...
See Issue #3400
Upstream-commit: ad80da33895aa9f2200279282acc25e4b2bcbf27
Component: engine
2013-12-30 20:58:25 -05:00
d5ba3da179
Update for Ubuntu 13.10
...
With two additional commands, this procedure will work for Ubuntu 13.10 using the image stackbrew/ubuntu:13.10.
1) change /etc/pam.d/sshd, pam_loginuid line 'required' to 'optional'
2) echo LANG=\"en_US.UTF-8\" > /etc/default/locale
Upstream-commit: 1f80c2a652b03d84718c2e61b7761f939de3b07a
Component: engine
2013-12-30 17:50:58 -08:00
6c85a7de88
Merge pull request #3303 from crosbymichael/add-host-flag
...
Add DOCKER_HOST env var for client
Upstream-commit: 1bc3f6b7b5fd8d15df2238fc77f5aeb9624a6582
Component: engine
2013-12-30 15:54:37 -08:00
46e4624179
Merge pull request #3395 from jamtur01/basicsfixes
...
Minor fixes to the basic command documentation
Upstream-commit: 643621133fafc7ea0b479cd636afd1e397055930
Component: engine
2013-12-30 15:41:59 -08:00
f0c55c27ee
simplify the volumes documentation and mention more details
...
Upstream-commit: fd240413ff835ee72741d839dccbee24e5cc410c
Component: engine
2013-12-31 09:09:57 +10:00
4e4ce7a3e6
Merge pull request #3344 from tianon/dockerfile-cleanup
...
Many various Dockerfile cleanups
Upstream-commit: 392b1e99b2ec9c368f81cca99093a406ae3697b9
Component: engine
2013-12-30 11:26:13 -08:00
1a0b6cfa05
Minor fixes to the basic command documentation
...
Upstream-commit: 0dfebf2d93e4990f12ba5d434e1750046008782f
Component: engine
2013-12-30 13:57:11 -05:00
b284ad7fc3
Merge pull request #3394 from jamtur01/clifixes
...
Numerous small fixes to the CLI documentation
Upstream-commit: 40aaebe56ac2de4294baacaa8aa61b20c3b2dabe
Component: engine
2013-12-30 10:56:47 -08:00
70af7e708f
Numerous small fixes to the CLI documentation
...
Upstream-commit: a1dba16fe8562ed0545eaa3c6ed23bb1043dd102
Component: engine
2013-12-30 13:48:12 -05:00
038cb6fc8c
Merge pull request #3371 from Grunny/volumes-typo-fix
...
Fix typo in working with volumes doc page
Upstream-commit: e31f1f1eba498c3ff4073a43533e68bf993cbbcb
Component: engine
2013-12-30 10:35:09 -08:00
09f511f43d
Merge pull request #3312 from DeX77/master
...
Installation for FrugalWare
Upstream-commit: 7e720d0a7797698c393ef2a204c87199463ca1a8
Component: engine
2013-12-30 10:34:39 -08:00
ea65bc7c4b
Merge pull request #3380 from SvenDowideit/add-no-auth-note
...
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
Upstream-commit: 237868e9c3f9d1cb5f5311ef2710f83e1b3b898a
Component: engine
2013-12-30 10:00:51 -08:00
06c747c212
Fix install failure when busybox can't be downloaded
...
Whether or not the "busybox" image downloads and runs properly at the end of the build, we don't want to have the script return a failing exit code, especially since at that point, Docker is successfully installed, and we're just tooting our own horn for good measure.
Upstream-commit: fc197188d7f4098b6035d0e13031431871a2dc95
Component: engine
2013-12-30 08:38:43 -07:00
3509344614
Merge pull request #3386 from bwiklund/headerfix
...
Fixed header image on docs.docker.io site
Upstream-commit: d59080d11900f0c7260926a2bfe6a96f0c1f7924
Component: engine
2013-12-30 06:48:02 -08:00
98a0b9e86f
Add more TestBuild Dockerfiles, especially for making sure manual RUN echo '#!...' continues to work correctly
...
Upstream-commit: c6dcee329dc9e720d70d9534c261fe9e9cf80512
Component: engine
2013-12-30 00:10:48 -07:00
5ca82c401d
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
...
Upstream-commit: 484a75f3549239d0489cb0ad518d79ed6783584a
Component: engine
2013-12-29 23:27:01 -07:00
c647c27460
fixed header size on narrow desktop window
...
Upstream-commit: 434cf6c8ca5d20306dc27e770155ba05a931adec
Component: engine
2013-12-29 19:22:52 -08:00
c4d7d823e4
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
...
Fixes #3383
Upstream-commit: 83d631b6a455d3041b7cb31e1c7eb45a16715c43
Component: engine
2013-12-29 13:25:57 -07:00
cc877515e3
Make blank -H option default to the same as no -H was sent
...
Upstream-commit: 8b82b0dfe74684b5ea30b7487475f7ca4abcc58e
Component: engine
2013-12-29 14:36:46 -05:00
5e0630fcf8
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
...
Upstream-commit: e93b7b464733470a08a46b9937678fbfdff0abb0
Component: engine
2013-12-29 21:27:59 +10:00
e302881b24
Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion"
...
This is split off from #2970 .
Upstream-commit: 06a818616bfce86e90152aeaffaf9394a085c356
Component: engine
2013-12-29 01:46:00 -07:00
87ba43c927
Add DOCKER_HOST env var for client
...
This env var will set the -H flag on the docker
client.
Upstream-commit: f50b8b08b5742c8e55df2d610d428c39cf1f4947
Component: engine
2013-12-28 16:42:18 -08:00
af79735338
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
...
Fixes #3372
Upstream-commit: cda146547e59ff875b3eb6202a87004a3f7ea96d
Component: engine
2013-12-28 06:35:00 -07:00
a3a982cef5
Fix typo in working with volumes doc page
...
Upstream-commit: a17fd7b294e1334788e1812f8cc1a99e5300724b
Component: engine
2013-12-28 20:22:46 +10:00
ed7881ff0c
Merge pull request #3358 from asbjornenge/master
...
Apply automatically to files named 'Dockerfile'
Upstream-commit: 22162687df146f381d73bdea90b2f016f001ce91
Component: engine
2013-12-27 08:22:52 -08:00
0cd52002c8
* s/docker/Docker/
...
Upstream-commit: d256f3049b36ae1a1dd596535b4a82d265ff9eee
Component: engine
2013-12-27 11:55:57 +01:00
1bab794e11
Apply automatically to files named 'Dockerfile'
...
Upstream-commit: a1a4a99d7e80cadb97bf58963b76cd0c762888a6
Component: engine
2013-12-27 10:05:25 +01:00
63c010af99
Exit with code 1 in case of error for docker build
...
Upstream-commit: 4986958e7e61bb0439a59c46af000b157798b94a
Component: engine
2013-12-26 17:49:41 -08:00
5791b4e848
Hash the sums for directory (ureadable when there is too many
...
Upstream-commit: cd735496da6d977748d5c3b19976f42d2cc1933e
Component: engine
2013-12-26 16:42:05 -08:00
e485023364
Change BuildFile in order to use TarSum instead of custom checksum
...
Upstream-commit: 894d4a23fba1a67087ae5bbe9c50c56e6dc09289
Component: engine
2013-12-26 16:16:26 -08:00
