github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

build: Add --skip-platforms flag

Browse Source 
This adds a --skip-platforms flag that can be used with
lkt pkg build to ignore any arch specified in build.yml

Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
This commit is contained in:
Dave Tucker 2021-05-02 12:46:21 +01:00
parent 54185c8a3f
commit 0320678133
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cmd/linuxkit/pkg_build.go
View File

@ -28,6 +28,7 @@ func pkgBuild(args []string) {
force := flags.Bool("force", false, "Force rebuild") force := flags.Bool("force", false, "Force rebuild")
docker := flags.Bool("docker", false, "Store the built image in the docker image cache instead of the default linuxkit cache") docker := flags.Bool("docker", false, "Store the built image in the docker image cache instead of the default linuxkit cache")
platforms := flags.String("platforms", "", "Which platforms to build for, defaults to all of those for which the package can be built") platforms := flags.String("platforms", "", "Which platforms to build for, defaults to all of those for which the package can be built")
skipPlatforms := flags.String("skip-platforms", "", "Platforms that should be skipped, even if present in build.yml")
builders := flags.String("builders", "", "Which builders to use for which platforms, e.g. linux/arm64=docker-context-arm64, overrides defaults and environment variables, see https://github.com/linuxkit/linuxkit/blob/master/docs/packages.md#Providing-native-builder-nodes") builders := flags.String("builders", "", "Which builders to use for which platforms, e.g. linux/arm64=docker-context-arm64, overrides defaults and environment variables, see https://github.com/linuxkit/linuxkit/blob/master/docs/packages.md#Providing-native-builder-nodes")
buildCacheDir := flags.String("cache", defaultLinuxkitCache(), "Directory for storing built image, incompatible with --docker") buildCacheDir := flags.String("cache", defaultLinuxkitCache(), "Directory for storing built image, incompatible with --docker")
@ -47,13 +48,34 @@ func pkgBuild(args []string) {
if *docker { if *docker {
opts = append(opts, pkglib.WithBuildTargetDockerCache()) opts = append(opts, pkglib.WithBuildTargetDockerCache())
} }
// skipPlatformsMap contains platforms that should be skipped
skipPlatformsMap := make(map[string]bool)
if *skipPlatforms != "" {
for _, platform := range strings.Split(*skipPlatforms, ",") {
parts := strings.SplitN(platform, "/", 2)
if len(parts) != 2 || parts[0] == "" || parts[0] != "linux" || parts[1] == "" {
fmt.Fprintf(os.Stderr, "invalid target platform specification '%s'\n", platform)
os.Exit(1)
}
skipPlatformsMap[strings.Trim(parts[1], " ")] = true
}
}
// if platforms requested is blank, use all from the config // if platforms requested is blank, use all from the config
var plats []imagespec.Platform var plats []imagespec.Platform
if *platforms == "" { if *platforms == "" {
for _, a := range p.Arches() { for _, a := range p.Arches() {
if _, ok := skipPlatformsMap[a]; ok {
continue
}
plats = append(plats, imagespec.Platform{OS: "linux", Architecture: a}) plats = append(plats, imagespec.Platform{OS: "linux", Architecture: a})
} }
} else { } else {
// don't allow the use of --skip-platforms with --platforms
if *skipPlatforms != "" {
fmt.Fprintln(os.Stderr, "--skip-platforms and --platforms may not be used together")
os.Exit(1)
}
for _, p := range strings.Split(*platforms, ",") { for _, p := range strings.Split(*platforms, ",") {
parts := strings.SplitN(p, "/", 2) parts := strings.SplitN(p, "/", 2)
if len(parts) != 2 || parts[0] == "" || parts[1] == "" { if len(parts) != 2 || parts[0] == "" || parts[1] == "" {