github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-03 12:43:19 +00:00
Code Issues Projects Releases Wiki Activity

Remove the hyperkit option

Browse Source 
We are going to phase out the LinuxKit build option, in favour of keeping Docker
or a native Linux build option for CI use cases, as it is faster. So the
hyperkit option that only worked in one very limited use case is not needed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-10-03 15:55:02 +01:00
parent ccaba8acc1
commit aca26f00c2
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/moby/build.go
View File

@@ -9,7 +9,6 @@ import (
"net/http"
"os"
"path/filepath"
"runtime"
"strconv"
"strings"
@@ -72,7 +71,6 @@ func build(args []string) {
buildSize := buildCmd.String("size", "1024M", "Size for output image, if supported and fixed size")
buildPull := buildCmd.Bool("pull", false, "Always pull images")
buildDisableTrust := buildCmd.Bool("disable-content-trust", false, "Skip image trust verification specified in trust section of config (default false)")
buildHyperkit := buildCmd.Bool("hyperkit", runtime.GOOS == "darwin", "Use hyperkit for LinuxKit based builds where possible")
buildCmd.Var(&buildFormats, "format", "Formats to create [ "+strings.Join(outputTypes, " ")+" ]")
if err := buildCmd.Parse(args); err != nil {
@@ -231,7 +229,7 @@ func build(args []string) {
if outputFile == nil {
image := buf.Bytes()
log.Infof("Create outputs:")
err = moby.Formats(filepath.Join(*buildDir, name), image, buildFormats, size, *buildHyperkit)
err = moby.Formats(filepath.Join(*buildDir, name), image, buildFormats, size)
if err != nil {
log.Fatalf("Error writing outputs: %v", err)
}