introduce dockerfile_inline

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
compose-spec · Mar 8, 2023 · 5972ca5 · 5972ca5
1 parent 5837d67
commit 5972ca5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/loader/normalize.go b/loader/normalize.go
@@ -72,7 +72,7 @@ func Normalize(project *types.Project, resolvePaths bool) error {
 		}
 
 		if s.Build != nil {
-			if s.Build.Dockerfile == "" {
+			if s.Build.Dockerfile == "" && s.Build.DockerfileInline == "" {
 				s.Build.Dockerfile = "Dockerfile"
 			}
 			localContext := absPath(project.WorkingDir, s.Build.Context)

diff --git a/loader/validate.go b/loader/validate.go
@@ -32,6 +32,12 @@ func checkConsistency(project *types.Project) error {
 			return errors.Wrapf(errdefs.ErrInvalid, "service %q has neither an image nor a build context specified", s.Name)
 		}
 
+		if s.Build != nil {
+			if s.Build.DockerfileInline != "" && s.Build.Dockerfile != "" {
+				return errors.Wrapf(errdefs.ErrInvalid, "service %q declares mutualy exclusive dockerfile and dockerfile_inline", s.Name)
+			}
+		}
+
 		for network := range s.Networks {
 			if _, ok := project.Networks[network]; !ok {
 				return errors.Wrap(errdefs.ErrInvalid, fmt.Sprintf("service %q refers to undefined network %s", s.Name, network))

diff --git a/schema/compose-spec.json b/schema/compose-spec.json
@@ -90,6 +90,7 @@
               "properties": {
                 "context": {"type": "string"},
                 "dockerfile": {"type": "string"},
+                "dockerfile_inline": {"type": "string"},
                 "args": {"$ref": "#/definitions/list_or_dict"},
                 "ssh": {"$ref": "#/definitions/list_or_dict"},
                 "labels": {"$ref": "#/definitions/list_or_dict"},

diff --git a/types/types.go b/types/types.go
@@ -294,23 +294,24 @@ func (s set) toSlice() []string {
 
 // BuildConfig is a type for build
 type BuildConfig struct {
-	Context    string                `yaml:",omitempty" json:"context,omitempty"`
-	Dockerfile string                `yaml:",omitempty" json:"dockerfile,omitempty"`
-	Args       MappingWithEquals     `yaml:",omitempty" json:"args,omitempty"`
-	SSH        SSHConfig             `yaml:"ssh,omitempty" json:"ssh,omitempty"`
-	Labels     Labels                `yaml:",omitempty" json:"labels,omitempty"`
-	CacheFrom  StringList            `mapstructure:"cache_from" yaml:"cache_from,omitempty" json:"cache_from,omitempty"`
-	CacheTo    StringList            `mapstructure:"cache_to" yaml:"cache_to,omitempty" json:"cache_to,omitempty"`
-	NoCache    bool                  `mapstructure:"no_cache" yaml:"no_cache,omitempty" json:"no_cache,omitempty"`
-	Pull       bool                  `mapstructure:"pull" yaml:"pull,omitempty" json:"pull,omitempty"`
-	ExtraHosts HostsList             `mapstructure:"extra_hosts" yaml:"extra_hosts,omitempty" json:"extra_hosts,omitempty"`
-	Isolation  string                `yaml:",omitempty" json:"isolation,omitempty"`
-	Network    string                `yaml:",omitempty" json:"network,omitempty"`
-	Target     string                `yaml:",omitempty" json:"target,omitempty"`
-	Secrets    []ServiceSecretConfig `yaml:",omitempty" json:"secrets,omitempty"`
-	Tags       StringList            `mapstructure:"tags" yaml:"tags,omitempty" json:"tags,omitempty"`
-	Platforms  StringList            `mapstructure:"platforms" yaml:"platforms,omitempty" json:"platforms,omitempty"`
-	Privileged bool                  `yaml:",omitempty" json:"privileged,omitempty"`
+	Context          string                `yaml:",omitempty" json:"context,omitempty"`
+	Dockerfile       string                `yaml:",omitempty" json:"dockerfile,omitempty"`
+	DockerfileInline string                `yaml:",omitempty" json:"dockerfile_inline,omitempty"`
+	Args             MappingWithEquals     `yaml:",omitempty" json:"args,omitempty"`
+	SSH              SSHConfig             `yaml:"ssh,omitempty" json:"ssh,omitempty"`
+	Labels           Labels                `yaml:",omitempty" json:"labels,omitempty"`
+	CacheFrom        StringList            `mapstructure:"cache_from" yaml:"cache_from,omitempty" json:"cache_from,omitempty"`
+	CacheTo          StringList            `mapstructure:"cache_to" yaml:"cache_to,omitempty" json:"cache_to,omitempty"`
+	NoCache          bool                  `mapstructure:"no_cache" yaml:"no_cache,omitempty" json:"no_cache,omitempty"`
+	Pull             bool                  `mapstructure:"pull" yaml:"pull,omitempty" json:"pull,omitempty"`
+	ExtraHosts       HostsList             `mapstructure:"extra_hosts" yaml:"extra_hosts,omitempty" json:"extra_hosts,omitempty"`
+	Isolation        string                `yaml:",omitempty" json:"isolation,omitempty"`
+	Network          string                `yaml:",omitempty" json:"network,omitempty"`
+	Target           string                `yaml:",omitempty" json:"target,omitempty"`
+	Secrets          []ServiceSecretConfig `yaml:",omitempty" json:"secrets,omitempty"`
+	Tags             StringList            `mapstructure:"tags" yaml:"tags,omitempty" json:"tags,omitempty"`
+	Platforms        StringList            `mapstructure:"platforms" yaml:"platforms,omitempty" json:"platforms,omitempty"`
+	Privileged       bool                  `yaml:",omitempty" json:"privileged,omitempty"`
 
 	Extensions map[string]interface{} `yaml:",inline" json:"-"`
 }