Commit Graph

24 Commits

Author SHA1 Message Date
Tibor Vass 625be9e469 Merge pull request #8827 from jlhawn/build_implied_from_scratch
Make `FROM scratch` a special cased 'no-base' spec
Upstream-commit: 610842f906a942e9784bc16c201860dc89ba19ba
Component: engine
2014-12-18 18:21:16 -05:00
Josh Hawn 98bb6eba72 Make FROM scratch a special cased 'no-base' spec
There has been a lot of discussion (issues 4242 and 5262) about making
`FROM scratch` either a special case or making `FROM` optional, implying
starting from an empty file system.

This patch makes the build command `FROM scratch` special cased from now on
and if used does not pull/set the the initial layer of the build to the ancient
image ID (511136ea..) but instead marks the build as having no base image. The
next command in the dockerfile will create an image with a parent image ID of "".
This means every image ever can now use one fewer layer!

This also makes the image name `scratch` a reserved name by the TagStore. You
will not be able to tag an image with this name from now on. If any users
currently have an image tagged as `scratch`, they will still be able to use that
image, but will not be able to tag a new image with that name.

Goodbye '511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158',
it was nice knowing you.

Fixes #4242

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 8936789919c5c8004f346f44a3452d1521818b60
Component: engine
2014-12-18 14:03:38 -08:00
Tianon Gravi f9482108f5 Merge pull request #9688 from dqminh/fix-make-tgz
make.sh tgz should handle windows binary
Upstream-commit: 1531bf48aa87b4a8336ab735ef025e83f09acac1
Component: engine
2014-12-18 13:16:32 -08:00
unclejack 401a4f9dcd kr/pty: vendor upstream 05017fcccf
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 2524c0c5555f9127b4cd3d326430617f72979bab
Component: engine
2014-12-17 23:23:24 +02:00
Daniel, Dao Quang Minh 148e64f5bf add binary extension to docker binary in tgz
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: ed7aa47dea9553a89e39c16397752ef0e791aab3
Component: engine
2014-12-16 22:55:29 -05:00
Sven Dowideit 752a46a922 Give maintainers the power to add contributor's DCO to a commit message, or to use their own if its a trvial change
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 56e3f49d1900f86b429a5a69839cc4f95af4dedc
Component: engine
2014-12-17 10:02:36 +10:00
Tianon Gravi 3cceb0c88b Remove small patch exception checking in hack/make/validate-dco
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 3d8f40b35b7f035bbcd7b7f99064838b24afa1f6
Component: engine
2014-12-17 10:02:36 +10:00
Michael Crosby 5b0faf336a Merge pull request #8845 from vbatts/vbatts-issue_template
CONTRIBUTING: provide a template for new issues
Upstream-commit: c6a70bc78a504076c5fdc99e565973a04dab31d5
Component: engine
2014-12-16 10:41:43 -08:00
Daniel, Dao Quang Minh 864f4f18b5 make.sh tgz should handle windows binary
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 17f8e3dee2d0df54b848cbb13af1986abe07db9f
Component: engine
2014-12-16 05:05:18 -05:00
Jessica Frazelle 3e6d4351a9 Updates to release checklist.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 473a443d84084e0393be2a1606d3fa49a26f4dbd
Component: engine
2014-12-11 18:47:47 -08:00
Michael Crosby 7f73c7a751 Update libcontainer to 53eca435e63db58b06cf796d3a9
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 269b37503e00f86b9215bc6fe27c502cf4d90072
Component: engine
2014-12-03 14:53:11 -08:00
Dan Walsh 9576e39bda Merge branch 'master' of github.com:docker/docker into debug
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 61586414ca227f7c61395ccf9605f5ceece54399
Component: engine
2014-11-25 14:09:19 -05:00
Arnaud Porterie f702226e49 Merge pull request #9225 from icecrime/win_make_binary
Adapt project/make.sh for Windows builds
Upstream-commit: ce8ebaf0e013fd4a7f6e04b36d0a2c57a19aeef9
Component: engine
2014-11-21 08:37:19 -08:00
Michael Crosby 2a4e189795 Update libcontainer to 84c1636580a356db88b079d118b
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f42176434aa874afb7d633064f2babcf9d5124ab
Component: engine
2014-11-20 14:19:24 -08:00
Tibor Vass fa056c1bc9 Merge pull request #9201 from vieux/add_hostname_docker_info
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
2014-11-20 13:11:16 -05:00
Dan Walsh 6ebbd4b25f Allow developers to build docker with debuginfo included
If you execute

DEBUG=-g hack/make.sh dynbinary

Docker will be build with the debug info making it easier to use
cgdb or lightide to debug.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: bce9ed0e4c56b85c8a4a5ba2b1af45035deec9dd
Component: engine
2014-11-20 12:59:50 -05:00
Victor Vieux 4b4f9725e6 Update libtrust version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6e92dfdfd843aec909572a405337efb25beb6f58
Component: engine
2014-11-20 17:39:54 +00:00
Arnaud Porterie eb838e9fad Adapt project/make.sh for Windows builds
Fixes:
- link -H windows is not compatible with -linkmode external
- under Cygwin go does not play well with cygdrive type paths

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ce86d5ae6826b0ec3dcf3188f8a6bd37b0afd3b2
Component: engine
2014-11-19 13:41:57 -08:00
Vincent Batts e5e6585e2a issue report script
Add a script that will facilitate standard issue reports.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Upstream-commit: ea5a2c1fd74af1a806c8f4ef7858afe6435d90fa
Component: engine
2014-11-19 12:32:45 -05:00
Michael Crosby 7c799c6dee Merge pull request #9187 from icecrime/update_authors_file
Update AUTHORS file
Upstream-commit: 0722c9b536a6f9617f77090bfc78b9c583a1b8d1
Component: engine
2014-11-18 16:31:07 -08:00
Michael Crosby a531c55832 Update libcontainer to 28cb5f9dfd6f3352c610a4f1502
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 975fa5487ca531374fed421b52de1adf133c9810
Component: engine
2014-11-17 12:16:37 -08:00
Arnaud Porterie 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
Ahmet Alp Balkan 35f4af009d Add windows/(386,amd64) to cross platforms list
Edited make scripts to append .exe to windows binary

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: b7703a992e14255a5972bf157d0c2cfc0da3d53f
Component: engine
2014-11-14 18:20:54 -08:00
Solomon Hykes e8e8b5b2cb Move 'hack' to the less confusing 'project'
We might want to break it up into smaller pieces (eg. tools in one
place, documents in another) but let's worry about that later.

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 32e61b8f5c3f855f5e204064be1aea6a877dda43
Component: engine
2014-11-09 21:50:28 +00:00