Tianon Gravi
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
Paul
5d674e11a2
Mac OSX command for pip was incorrect
...
Upstream-commit: f3816ee024fe66a207381832bfc97ea123ec72ed
Component: engine
2014-01-02 09:52:07 +13:00
Christophe Troestler
a97ab92d81
Implement suggestions
...
Upstream-commit: 0b3e153588876fdc2bddde2e9064598e26276a09
Component: engine
2014-01-01 12:28:22 +01:00
Christophe Troestler
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
Tianon Gravi
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
Thomas LEVEIL
deba21c185
support for container names in bash completion
...
Upstream-commit: 055b32e3f4adfd490449b41d0cd6bc6ad5b7466a
Component: engine
2013-12-31 11:34:23 +00:00
Michael Crosby
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
Tianon Gravi
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
Tianon Gravi
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
Ryan O'Donnell
93593cd471
Fixes Issue #3400
...
See Issue #3400
Upstream-commit: ad80da33895aa9f2200279282acc25e4b2bcbf27
Component: engine
2013-12-30 20:58:25 -05:00
rgstephens
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
Andy Rothfusz
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
Andy Rothfusz
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
Sven Dowideit
f0c55c27ee
simplify the volumes documentation and mention more details
...
Upstream-commit: fd240413ff835ee72741d839dccbee24e5cc410c
Component: engine
2013-12-31 09:09:57 +10:00
Solomon Hykes
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
James Turnbull
1a0b6cfa05
Minor fixes to the basic command documentation
...
Upstream-commit: 0dfebf2d93e4990f12ba5d434e1750046008782f
Component: engine
2013-12-30 13:57:11 -05:00
Andy Rothfusz
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
James Turnbull
70af7e708f
Numerous small fixes to the CLI documentation
...
Upstream-commit: a1dba16fe8562ed0545eaa3c6ed23bb1043dd102
Component: engine
2013-12-30 13:48:12 -05:00
Andy Rothfusz
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
Andy Rothfusz
09f511f43d
Merge pull request #3312 from DeX77/master
...
Installation for FrugalWare
Upstream-commit: 7e720d0a7797698c393ef2a204c87199463ca1a8
Component: engine
2013-12-30 10:34:39 -08:00
Andy Rothfusz
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
Tianon Gravi
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
Tianon Gravi
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
Tianon Gravi
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
Ben Wiklund
c647c27460
fixed header size on narrow desktop window
...
Upstream-commit: 434cf6c8ca5d20306dc27e770155ba05a931adec
Component: engine
2013-12-29 19:22:52 -08:00
Tianon Gravi
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
Brian Goff
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
Sven Dowideit
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
Tianon Gravi
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
Michael Crosby
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
Tianon Gravi
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
grunny
a3a982cef5
Fix typo in working with volumes doc page
...
Upstream-commit: a17fd7b294e1334788e1812f8cc1a99e5300724b
Component: engine
2013-12-28 20:22:46 +10:00
Daniel Exner
0cd52002c8
* s/docker/Docker/
...
Upstream-commit: d256f3049b36ae1a1dd596535b4a82d265ff9eee
Component: engine
2013-12-27 11:55:57 +01:00
Asbjørn Enge
1bab794e11
Apply automatically to files named 'Dockerfile'
...
Upstream-commit: a1a4a99d7e80cadb97bf58963b76cd0c762888a6
Component: engine
2013-12-27 10:05:25 +01:00
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
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
Guillaume J. Charmes
ad15888099
Log files name along with their checksum in TarSum + add a Method to retrieve the checksum map
...
Upstream-commit: fc9f4d8bad975ffe060eb741b38c5502dd9886a4
Component: engine
2013-12-26 16:01:36 -08:00
Guillaume J. Charmes
a3c5984691
Make sure the cache lookup returns always the same result
...
Upstream-commit: 1d4b7d8fa1af95ce83f263a49ed24e686fa7cb62
Component: engine
2013-12-26 15:43:27 -08:00
Guillaume J. Charmes
d755e22ee6
Remove old debug from tarsum
...
Upstream-commit: 360078d7613e1939c6d2f949ccac14c6ab9d568e
Component: engine
2013-12-26 15:39:06 -08:00
Guillaume J. Charmes
93558ee08f
Merge pull request #3343 from bwiklund/comment-edits
...
small batch of edits/corrections to comments
Upstream-commit: 808f2d39bde6884f299d72097ed28604e27c9cbb
Component: engine
2013-12-26 10:22:33 -08:00
Guillaume J. Charmes
372a1c9fdf
Merge pull request #3347 from smarterclayton/patch-1
...
Fix typo in devmapper error message
Upstream-commit: d1ca12e81b1fc35e5ac1986439a85feaa9237a9d
Component: engine
2013-12-26 10:19:55 -08:00
Manuel Woelker
1a7338c423
Document "name" query parameter for "POST /containers/create" in Remote API v1.8
...
Upstream-commit: 721bb410f6caa213b7d4eed9373be74287605ffc
Component: engine
2013-12-26 06:43:26 +01:00
Clayton Coleman
010169891e
Fix typo in devmapper error message
...
Upstream-commit: 029625981d3872872f0de95c5a4ea68cb1fa93af
Component: engine
2013-12-25 15:49:58 -05:00
Ben Wiklund
044c307631
small batch of edits/corrections to comments
...
Upstream-commit: 0fccf0f68655fd01973e4c00bbb063fad1bce56c
Component: engine
2013-12-24 16:40:14 -08:00
Guillaume J. Charmes
e297baa1c0
Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles
...
Issue #880 - cache ADD commands in dockerfiles
Upstream-commit: efaf2cac5c8d54a5098f7036e738e1f919f84452
Component: engine
2013-12-24 16:22:51 -08:00
Guillaume J. Charmes
a35b7b892f
Merge pull request #3337 from tianon/release-darwin
...
Release tgz and binaries for cross-compiled platforms
Upstream-commit: cb1fe939a88af2c254a5c13a4a11aafea2fd08dd
Component: engine
2013-12-24 14:44:41 -08:00
James Turnbull
4fb94b472a
Fixed #3039 - Added clarify on port options in API
...
Upstream-commit: d2d8a4a6c507bc8e7d591925276d79d89ce6beaf
Component: engine
2013-12-24 13:01:59 -05:00
Tianon Gravi
7db2296200
Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos
...
Upstream-commit: 4100e9b7df5cbce855b47b3625d34c9667e40dc1
Component: engine
2013-12-23 23:55:06 -07:00
Tianon Gravi
cc04ab4930
Merge pull request #3112 from shawnl/master
...
hack/PACKAGERS.md: libdevmapper
Upstream-commit: 5875953d9be0bf3339185dd6b5c4b1e185eb85b6
Component: engine
2013-12-23 19:24:36 -08:00
