From 695ae97dfc28c23763257b20223f6de3b8758abb Mon Sep 17 00:00:00 2001 From: Ilya Lesikov Date: Fri, 17 Jun 2022 16:24:02 +0300 Subject: [PATCH] feat(buildah): container runtime autodetection Signed-off-by: Ilya Lesikov --- pkg/buildah/common.go | 1 - pkg/buildah/docker_with_fuse.go | 2 +- pkg/buildah/native_linux.go | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/buildah/common.go b/pkg/buildah/common.go index c348f72613..936781ac34 100644 --- a/pkg/buildah/common.go +++ b/pkg/buildah/common.go @@ -20,7 +20,6 @@ const ( DefaultShmSize = "65536k" DefaultSignaturePolicy = `{"default": [{"type": "insecureAcceptAnything"}], "transports": {"docker-daemon": {"": [{"type": "insecureAcceptAnything"}]}}}` DefaultRegistriesConfig = `unqualified-search-registries = ["docker.io"]` - DefaultRuntime = "crun" BuildahImage = "registry.werf.io/werf/buildah:v1.22.3-1" BuildahStorageContainerName = "werf-buildah-storage" diff --git a/pkg/buildah/docker_with_fuse.go b/pkg/buildah/docker_with_fuse.go index 2e9cdf4caf..b579ce9e92 100644 --- a/pkg/buildah/docker_with_fuse.go +++ b/pkg/buildah/docker_with_fuse.go @@ -124,7 +124,7 @@ func (b *DockerWithFuseBuildah) BuildFromDockerfile(ctx context.Context, dockerf } func (b *DockerWithFuseBuildah) RunCommand(ctx context.Context, container string, command []string, opts RunCommandOpts) error { - _, _, err := b.runBuildah(ctx, []string{}, append([]string{"run", "--isolation", b.Isolation.String(), "--runtime", DefaultRuntime, container}, command...), opts.LogWriter) + _, _, err := b.runBuildah(ctx, []string{}, append([]string{"run", "--isolation", b.Isolation.String(), container}, command...), opts.LogWriter) return err } diff --git a/pkg/buildah/native_linux.go b/pkg/buildah/native_linux.go index 6af11b6c73..50c4eec18b 100644 --- a/pkg/buildah/native_linux.go +++ b/pkg/buildah/native_linux.go @@ -184,7 +184,6 @@ func (b *NativeBuildah) Push(ctx context.Context, ref string, opts PushOpts) err func (b *NativeBuildah) BuildFromDockerfile(ctx context.Context, dockerfile []byte, opts BuildFromDockerfileOpts) (string, error) { buildOpts := define.BuildOptions{ Isolation: define.Isolation(b.Isolation), - Runtime: DefaultRuntime, Args: opts.BuildArgs, SignaturePolicyPath: b.SignaturePolicyPath, ReportWriter: opts.LogWriter, @@ -250,7 +249,6 @@ func (b *NativeBuildah) Umount(ctx context.Context, container string, opts Umoun func (b *NativeBuildah) RunCommand(ctx context.Context, container string, command []string, opts RunCommandOpts) error { runOpts := buildah.RunOptions{ Isolation: define.Isolation(b.Isolation), - Runtime: DefaultRuntime, Args: opts.Args, Mounts: opts.Mounts, ConfigureNetwork: define.NetworkEnabled,