James Turnbull
c028bb239f
Merge pull request #7234 from michielbdejong/patch-1
...
Typo in dockervolumes.md line 141?
2014-07-25 13:14:50 -04:00
fcarriedo
2fb63aba0b
pkg/units: including suggestions and enhancements
...
Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-25 09:33:04 -07:00
Johannes 'fish' Ziemke
32bc865879
Make sure err never gets masked
...
Defining err as named return parameter will make sure the variable gets
assigned before returning and thus avoid masking
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-07-25 17:00:41 +02:00
Deric Crago
3fb913ab77
apache2 was looking for two other directories
...
/var/lock/apache2
/var/run/apache2
2014-07-25 10:14:52 -04:00
Michiel@unhosted
9503afbc91
Typo in dockervolumes.md line 141?
2014-07-25 09:06:38 +02:00
Sven Dowideit
ff28b0b919
Merge pull request #7185 from thaJeztah/patch-1
...
Fix incorrect path in ENTRYPOINT example
2014-07-25 17:06:29 +10:00
Victor Vieux
5b293f1596
allow sigquit to display stacktrace in debug mode
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-25 01:08:04 +00:00
Victor Vieux
228c6a374b
Merge pull request #7225 from vieux/update_path
...
update go import path and libcontainer
2014-07-24 17:22:21 -07:00
unclejack
4fbc47e801
archive: add unclejack to MAINTAINERS
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-07-25 02:07:40 +03:00
Tianon Gravi
771ed23915
Add new script to generate AUTHORS and regenerate AUTHORS (fixing a few new dups too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-07-24 16:49:39 -06:00
Victor Vieux
1082246262
revert AUTHORS changes
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-24 22:30:05 +00:00
Victor Vieux
5a0ef08c94
gofmt -s -w
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-24 22:25:29 +00:00
Victor Vieux
b3ee9ac74e
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-24 22:19:50 +00:00
Aanand Prasad
393433b702
Merge pull request #347 from orchardup/fix-typo-yml-docs
...
Fix typo yml docs
2014-07-24 14:31:19 -07:00
Ben Firshman
7516b67a14
Add link to docker-osx in yml docs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-24 14:18:21 -07:00
Ben Firshman
5eac04d8d4
Fix typo in yml docs
...
From c09734822e
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-24 14:16:49 -07:00
Ben Firshman
fec41d3567
Merge pull request #288 from saulshanabrook/patch-1
...
Add warning for mapping local volumes
2014-07-24 22:15:49 +01:00
Saul Shanabrook
c09734822e
Add warning for mapping local volumes
...
Mapping local volumes is not currently supported in boot2docker
https://github.com/boot2docker/boot2docker/issues/413
https://github.com/dotcloud/docker/issues/4023
Signed-off-by: Saul Shanabrook <s.shanabrook@gmail.com >
2014-07-24 16:37:14 -04:00
fcarriedo
c765134ac9
pkg/units: Updated Compile() to MustCompile()
...
We were doing exactly what `regexp.MustCompile()` already does.
Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 13:19:20 -07:00
Aanand Prasad
94887a28c7
Make sure we support explicit protocols in port bindings
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2014-07-24 11:48:29 -07:00
Aanand Prasad
262efce43e
Fix test regression introduced in ed80576236
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2014-07-24 11:47:39 -07:00
Victor Vieux
2481e08e41
Merge pull request #7212 from mheon/kill_zero
...
Properly handle 0 being passed as a signal number
2014-07-24 11:42:16 -07:00
hollietealok
97283fa985
Merge remote-tracking branch 'upstream/master' into doc_remove
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
2014-07-24 11:28:19 -07:00
James Turnbull
7365225957
Added proposed Docker Community Guidelines
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-07-24 11:04:58 -07:00
Ben Firshman
99064d17dd
Docker, Inc.
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-24 10:24:17 -07:00
Michael Crosby
2ed10eae5b
Merge pull request #7179 from LK4D4/add_cap_audit_write_#6345
...
Add AUDIT_WRITE cap
2014-07-24 10:02:44 -07:00
Matthew Heon
be326b0ece
Properly handle 0 being passed as a signal
...
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com > (github: mheon)
2014-07-24 11:06:20 -04:00
James Turnbull
0758acfb03
Merge pull request #7199 from ipbabble/mp-changes
...
Fixed some typos for '--' Vs '-' in docker-run-1.md
2014-07-24 06:51:56 -07:00
Sebastiaan van Stijn
2819d9b406
Fix incorrect path in ENTRYPOINT example
...
The ENTRYPOINT example uses "/usr/bin/ls" as path, but `ls` is located at `/bin/ls`.
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl > (github: thaJeztah)
2014-07-24 14:48:23 +02:00
Alexandr Morozov
5b0d4cf296
Test on building from GIT url
...
Also I added fake git server to utils
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-24 11:19:16 +04:00
Francisco Carriedo
386d300a6e
pkg/units: Refactored common code to single func
...
Both functions perform the same logic and they just vary on the base
multiplication units. We can refactor the common code into a single
place.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 00:03:59 -07:00
Francisco Carriedo
e4ab996b9d
pkg/units: Moved 'units' out of function
...
No need to initialize every time the function executes since it works as
a catalog.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 00:03:59 -07:00
Francisco Carriedo
d512294382
pkg/units: Compacted var declaration and initialization
...
No need to have two lines. The type is even explicit when type casting
to `float64(size)`
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-24 00:03:40 -07:00
Francisco Carriedo
a4d57d8a85
pkg/units: Refactor regexp.Compile to init()
...
No need to recompile a fixed regular expression each time the function
executes. Abstracting it to the `init()` method.
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-23 23:45:03 -07:00
Francisco Carriedo
0fd37bd7ac
pkg/units: Standardized supported sizes
...
May make sense that both `FromHumanSize()` and `RAMInBytes()` support
the same units. Added 'PB' to the RAMInBytes regex.
Also updated tests.
Note: int64 is overflowed on quantities >= EB
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-23 23:37:06 -07:00
Tianon Gravi
9380e8cbe7
Merge pull request #7148 from tianon/buildtags-docs
...
Reorganize and clarify the DOCKER_BUILDTAGS docs
2014-07-23 22:27:07 -06:00
Francisco Carriedo
03697f0a93
pkg/units: Using 'case' instead of trickled ifs
...
Seems the perfect case for 'case' ;).
Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com > (github: fcarriedo)
2014-07-23 20:38:36 -07:00
Sven Dowideit
bb6217c055
Merge pull request #7181 from timruffles/patch-3
...
[DOCS] replace foo/bar with concrete names
2014-07-24 12:26:10 +10:00
Victor Vieux
6b65e8817c
Merge pull request #7108 from unclejack/archive_speedup
...
speed up archive
2014-07-23 16:54:35 -07:00
William Henry
1403372963
Typo changes to docker-run-1.md - changing '-' to '--' where approp.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
2014-07-23 16:49:07 -04:00
Vincent Batts
683038bf57
Merge pull request #6727 from unclejack/improve_bytes_range
...
Improve layer downloading
2014-07-23 15:31:25 -04:00
hollietealok
9fbae59244
Removed docker_io_oauth_api.md: Docker is not currently accepting registrations for third party auth while it's determined how this will be done, if at all, in the future.
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
2014-07-23 11:55:56 -07:00
Michael Crosby
92cba0845c
Merge pull request #7170 from unclejack/fix_testinspectlinksstopped
...
integcli: fix TestInspectLinksStopped with Go1.3
2014-07-23 11:19:11 -07:00
Michael Crosby
c71edef8d5
Merge pull request #7190 from vieux/merge_release_v1.1.2
...
Change version to 1.1.2-dev
2014-07-23 11:16:18 -07:00
Victor Vieux
56bb7ce780
Change version to 1.1.2-dev
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-23 18:09:02 +00:00
Michael Crosby
604a975303
Merge pull request #7164 from fcarriedo/not-error-as-var-name
...
pkg/units: Better to not use `error` as var name
2014-07-23 11:04:03 -07:00
Victor Vieux
1df87acb33
Merge pull request #7172 from vieux/bump_v1.1.2
...
Bump v1.1.2
2014-07-23 11:02:29 -07:00
James Turnbull
b9024174be
Merge pull request #7180 from rhuss/patch-1
...
Fixed parent-child relationship description
2014-07-23 10:17:19 -07:00
Fred Lifton
be3aa1eba0
Merge pull request #7176 from SvenDowideit/auto-update-master-cli-docs
...
user facing documentation changes in master atm
2014-07-23 10:15:02 -07:00
Aanand Prasad
ed80576236
Merge pull request #276 from marksteve/nocache
...
Add `--no-cache` option to `fig build` (Closes #152 )
2014-07-23 10:13:47 -07:00