Commit Graph

9 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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