Commit Graph

82 Commits

Author SHA1 Message Date
bd96bdb953 Update authors and mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b7e722fe30ccde2a6081be4df3fa0d7354514ba3
Component: engine
2018-05-21 01:07:22 +02:00
c3a24a0fbd Update authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fb005971c2bd82de482d1cfe924f2f4ec60c60ae
Component: engine
2018-02-21 21:12:31 +01:00
30c21da626 Update authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5db971324794b5de65447919dfe5f456d0730199
Component: engine
2018-01-24 00:55:47 -08:00
5b7cd70f03 Update mailmap and authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2df19b7c11349b961455b1c75b655a5f017dd7a4
Component: engine
2018-01-02 12:47:47 +01:00
27685bd51b Update mailmap and authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4309d3cf6b12fb7e9c5f23b756aed33f6dd74d1e
Component: engine
2017-10-04 14:44:24 +02:00
59247b3492 Update authors and mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6be41f3858522ac54f97b54a5011cda42828db39
Component: engine
2017-07-18 10:36:11 +02:00
b5058fb7d9 Update AUTHORS and mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 671805cce01b84edbf53ab721fc4f509beb71a1a
Component: engine
2017-05-12 16:45:49 +02:00
e450737ae9 Update Erica in mailmap
Fix my name and email address.

Signed-off-by: Erica Windisch <erica@windisch.us>
Upstream-commit: 88535f97330f278b1be2c736f74a88d6abc27ca6
Component: engine
2017-03-28 19:55:08 +00:00
e7e310b785 Update authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5dfac5499a147b66e81f091714c2c9df3107ec62
Component: engine
2017-02-23 02:17:51 +01:00
d0d3f107a2 Update AUTHORS
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 022bce54f547737cb73a507c977fdde8c44a43e2
Component: engine
2016-09-26 18:13:14 +02:00
c85ea51dd0 Fix double entry in authors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0829581d7ea97d7d931527c872dbf9921757f497
Component: engine
2016-06-03 12:40:36 +02:00
5cf10fd2aa Update mailmap and re-generate Authors
Signed-off-by: Martin Redmond <redmond.martin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b9676643c8d82711bfc0dd31c97cef7ce4204e9c
Component: engine
2016-06-01 20:19:46 +02:00
b7358edb69 Update AUTHORS
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: afeba190a5e533a6a276cd8f5889202389b8f9d3
Component: engine
2016-03-26 23:46:20 -07:00
319b064c6f update authors and mailmap
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: ae68dfe31b641a1dad7e3072ed2413dc32cfcd32
Component: engine
2015-06-06 21:42:14 -07:00
719f00fbf2 Move scripts back to hack/, leave docs in project/
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 949a21b55f3b8d7d1ae7a7b9829111a8f0dbf7e2
Component: engine
2015-03-13 14:04:08 -06:00
b7923cb061 Update AUTHORS file and .mailmap
added `LC_ALL=C.UTF-8` due to osx
http://www.inmotionhosting.com/support/website/ssh/speed-up-grep-searche
s-with-lc-all

Signed-off-by: Patrick Stapleton <github@gdi2290.com>
Upstream-commit: 6df0fdf91b426a4c3ec5fb4f53381cde4ee249f2
Component: engine
2015-01-15 19:56:41 -08:00
8ac9679df7 Update AUTHORS file
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ab7a6544b09c0b061e35aa7df766ef7adc1fd2fe
Component: engine
2014-11-16 23:41:25 -08:00
561c57e7b0 Updated AUTHORS file
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: 10ec205b77b117cc63e9dc8fe8aedf400c933dcd
Component: engine
2014-08-12 16:19:10 -07:00
024c2cf99d Regenerate AUTHORS one more time
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 7a34f1343372b0712155087a9a5f447b59b60084
Component: engine
2014-08-07 15:32:11 -06:00
56a4d87cf4 Add a few canonicalized author names
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: f8f36ff320d5b14a5fb61ab3fec0b1e7ef1e8aa6
Component: engine
2014-08-07 15:32:11 -06:00
ab4c9735de Change Peter Waller's canonical e-mail address
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: d687c5b3393a22e0db6473f0572a332f211c7102
Component: engine
2014-08-07 15:32:11 -06:00
1b6a85626e Run hack/generate-authors.sh
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: 7d78dc33b15c9c5fd4cc2c0c5526cdfd5505ee4f
Component: engine
2014-08-07 15:32:11 -06:00
d2405bde3d 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)
Upstream-commit: 771ed2391536ad722e32be519039454cc98668e8
Component: engine
2014-07-24 16:49:39 -06:00
4c6e7e81ee Update AUTHORS and .mailmap
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 89c4748b8351eaf070ce722fdb7fe0c0dcec2819
Component: engine
2014-05-18 13:26:13 -06:00
dba2ddd068 Fixes 5370 infinite/maxLoopCount loop for relative symlinks
use path.IsAbs() instead of checking if first char is '/'

Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
Upstream-commit: ad35d522dbfac124225e27f58bf07c61a34d78b5
Component: engine
2014-05-16 01:03:11 +02:00
785f4eb416 Check channel closed state in /events loop
When listener channel is closed, it becomes always available for
reading: select becomes an active loop which writes default-constructed
events (i.e: empty strings).

Fixes #5766.

Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <arnaud.porterie@gmail.com> (github: icecrime)
Upstream-commit: 8699f53e6a033a7b5b55a2b6356da7c6e220d01f
Component: engine
2014-05-14 22:35:04 +02:00
9a8663f86a daemon: container: ensure cp cannot traverse outside container rootfs
This patch fixes the bug that allowed cp to copy files outside of
the containers rootfs, by passing a relative path (such as
../../../../../../../../etc/shadow). This is fixed by first converting
the path to an absolute path (relative to /) and then appending it
to the container's rootfs before continuing.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: bfc3a4192ae5723e401470688cdae59b95bd61f1
Component: engine
2014-05-14 11:14:59 +10:00
db1f1daa38 Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
Upstream-commit: 99be2353329c7106958a852eb08776fac5c0c2b0
Component: engine
2014-05-05 13:41:43 -07:00
86a52049b2 update AUTHORS
Docker-DCO-1.1-Signed-off-by: Bryan Matsuo <bryan.matsuo@gmail.com> (github: bmatsuo)
Upstream-commit: 8caef610b2548273d48ace696d3a90ba0b510d66
Component: engine
2014-04-30 11:08:57 -06:00
1f9a09d037 Docs fix: correct /commit info
Correct documentation for POST /commit to reflect that the container's
configuration is supplied in the request body, and not as a query
parameter.

Also correct a small typo in the example JSON for create container.

Docker-DCO-1.1-Signed-off-by: Andy Goldstein <agoldste@redhat.com> (github: ncdc)
Upstream-commit: bba1dd046dd39405877c9f0b53502e68dddf36b1
Component: engine
2014-04-28 13:38:58 -04:00
f4ef3606d9 Add myself to AUTHORS.
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net> (github: kevinwallace)
Upstream-commit: e21607341cd8dc575098bd09a3c992da166f7884
Component: engine
2014-04-03 18:44:13 +00:00
b706d63e16 adding note that host-volumes must be defined using absolute paths
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com> (github: funkymonkeymonk)
Upstream-commit: 3ddfbf68802b7a62dcdefd46decb3f7f6faebabe
Component: engine
2014-03-01 20:43:53 -05:00
062d3a92ee Update .mailmap and AUTHORS
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bd85631ca56d0aaa5293e27048b20b6bfa45e679
Component: engine
2014-02-04 13:40:56 -07:00
e26aa09e8a Add Peter Waller <p@pwaller.net> to AUTHORS
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: c4c558d138c43c6e2a48fd3060c4b8c81ace989b
Component: engine
2014-01-27 22:21:58 +00:00
7837673428 Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2f6fb41dd149719ddbc7fd2bd891f03695a3769a
Component: engine
2014-01-16 20:13:51 -07:00
694098392a Don't compress the archive made from git's output.
Commit 894d4a23fba made BuildFile use TarSum, which doesn't support
compressed tar archives.
This breaks builds from git url, which compressed it with bzip2.
Instead, just pass it uncompressed.

Docker-DCO-1.0-Signed-off-by: Paul Lietar <paul@lietar.net> (github: plietar)
Upstream-commit: 562a23576328c1586f1be968fa15cb075267138c
Component: engine
2014-01-09 18:23:19 +00:00
d253920583 Revert "Add -S option to tar for efficient sparse file handling"
This reverts commit 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593.

This is needed to fix "no such file" errors `docker build` errors for
devicemapper.

This fixes issue #3449.

Docker-DCO-1.0-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d003cfea25c276904dbe1e972c0cf71d5c25e689
Component: engine
2014-01-08 02:58:39 +02:00
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
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
044c307631 small batch of edits/corrections to comments
Upstream-commit: 0fccf0f68655fd01973e4c00bbb063fad1bce56c
Component: engine
2013-12-24 16:40:14 -08:00
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
e69eef70c1 Add -S option to tar for efficient sparse file handling
Fixes issue #3282
Upstream-commit: 733bf5d3ddbfb6dba7c2c0996c4af47a765e4593
Component: engine
2013-12-19 21:41:22 -08:00
75328e1a1d Add self to AUTHORS.
Upstream-commit: 670b326c1b88d66ef941de5f27867ba6132762a1
Component: engine
2013-12-16 17:36:51 -08:00
6c91c91066 More informative error message on name collisions
This is the proposed fix for #2506. It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.

I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
2013-11-18 17:51:47 +00:00
b2bdca3ec2 Merge pull request #2712 from makinacorpus/master
Do not drop sys_boot
Upstream-commit: ad96d5ff04dd9b8284bad4f86ed285f905723951
Component: engine
2013-11-15 10:33:41 -08:00
b60d444c4f Merge pull request #2527 from jpoimboe/fedora-iptables-fix
Fix container networking on Fedora
Upstream-commit: d589cc36227702e40038704ab048efff23bc71d9
Component: engine
2013-11-11 15:12:40 -08:00
d772cfe673 make all image ID and container ID API responses use the Long ID (Closes #2098)
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
2013-11-09 12:16:49 +10:00
07f796bd96 network: add iptables rules to explicitly allow forwarding
Explicitly enable container networking for Fedora and other distros that
have a REJECT all rule at the end of their FORWARD table.
Upstream-commit: ec4657b28a3e97447921357d454df974e0979ac6
Component: engine
2013-11-07 16:23:39 -06:00
9fe5aeedd4 Merge pull request #2517 from gurjeet/patch-2
Add gurjeet  as an author
Upstream-commit: 7f7926525ac1aa1bd470121dbba22588f95e789e
Component: engine
2013-11-05 10:52:54 -08:00
00be4ae87e Merge pull request #2533 from jamtur01/add_sudo
Some format and syntax changes.
Upstream-commit: dc333878d2337684466f0241d19bccf3a4fad4b5
Component: engine
2013-11-04 11:24:51 -08:00