From e0aaccf4300756fba3644bf45e0751d408b05792 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Fri, 3 Mar 2023 11:36:12 +0100 Subject: [PATCH] introduce dockerfile_inline Signed-off-by: Nicolas De Loof --- go.mod | 2 +- go.sum | 4 ++-- pkg/compose/build.go | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 01a72ecdc..b860db08f 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/AlecAivazis/survey/v2 v2.3.6 github.com/buger/goterm v1.0.4 - github.com/compose-spec/compose-go v1.12.0 + github.com/compose-spec/compose-go v1.13.0 github.com/containerd/console v1.0.3 github.com/containerd/containerd v1.6.19 github.com/cucumber/godog v0.0.0-00010101000000-000000000000 diff --git a/go.sum b/go.sum index 40c8bf16a..d06f08736 100644 --- a/go.sum +++ b/go.sum @@ -165,8 +165,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/compose-spec/compose-go v1.12.0 h1:MSyWW//yijispnqmTqJSMv1ptRTlKU1sLPHJdc2ACnA= -github.com/compose-spec/compose-go v1.12.0/go.mod h1:0/X/dTehChV+KBB696nOOl+HYzKn+XaIm4i12phUB5U= +github.com/compose-spec/compose-go v1.13.0 h1:HHMc1XvnHJr9LUS7fPiiQeTSmGtEp+myn7jGnXgIoXE= +github.com/compose-spec/compose-go v1.13.0/go.mod h1:uo+YhhqDpkW9MjZNzJgOLX3MlbK6zHaBo9n8LhGDwsg= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= diff --git a/pkg/compose/build.go b/pkg/compose/build.go index fa7511f72..08dc06ed4 100644 --- a/pkg/compose/build.go +++ b/pkg/compose/build.go @@ -298,8 +298,9 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se return build.Options{ Inputs: build.Inputs{ - ContextPath: service.Build.Context, - DockerfilePath: dockerFilePath(service.Build.Context, service.Build.Dockerfile), + ContextPath: service.Build.Context, + DockerfileInline: service.Build.DockerfileInline, + DockerfilePath: dockerFilePath(service.Build.Context, service.Build.Dockerfile), }, CacheFrom: cacheFrom, CacheTo: cacheTo, @@ -343,6 +344,9 @@ func mergeArgs(m ...types.Mapping) types.Mapping { } func dockerFilePath(ctxName string, dockerfile string) string { + if dockerfile == "" { + return "" + } if urlutil.IsGitURL(ctxName) || filepath.IsAbs(dockerfile) { return dockerfile }