diff options
| author | Dan Duvall <dduvall@wikimedia.org> | 2018-09-17 16:00:05 -0700 |
|---|---|---|
| committer | Dan Duvall <dduvall@wikimedia.org> | 2018-10-01 16:40:20 -0700 |
| commit | af9e797908c0d5ed7780a5386aa773ecdd9cc51c (patch) | |
| tree | f8894bca5a9c40875b708a86554fcd922ca15380 /config/common.go | |
| parent | df5e386938769c48c604b2d1804f505d6faf6594 (diff) | |
| download | blubber-af9e797908c0d5ed7780a5386aa773ecdd9cc51c.tar.gz | |
Remove support for `sharedvolume` configuration
Support for mounting a shared volume instead of copying application
files was meant to provide an option for development use cases. This
functionality has never been thoroughly tested or utilized for any use
case. It should be removed for now.
Relates tangentially to task T204591 that simplifies node support.
Change-Id: Ib70cb7bceb504841897a38d732880ba376fe67c8
Diffstat (limited to 'config/common.go')
| -rw-r--r-- | config/common.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/config/common.go b/config/common.go index 0bdd4e4..32311b8 100644 --- a/config/common.go +++ b/config/common.go @@ -8,15 +8,14 @@ import ( // and each configured variant. // type CommonConfig struct { - Base string `yaml:"base" validate:"omitempty,baseimage"` // name/path to base image - Apt AptConfig `yaml:"apt"` // APT related - Node NodeConfig `yaml:"node"` // Node related - Python PythonConfig `yaml:"python"` // Python related - Builder BuilderConfig `yaml:"builder"` // Builder related - Lives LivesConfig `yaml:"lives"` // application owner/dir - Runs RunsConfig `yaml:"runs"` // runtime environment - SharedVolume Flag `yaml:"sharedvolume"` // use volume for app - EntryPoint []string `yaml:"entrypoint"` // entry-point executable + Base string `yaml:"base" validate:"omitempty,baseimage"` // name/path to base image + Apt AptConfig `yaml:"apt"` // APT related + Node NodeConfig `yaml:"node"` // Node related + Python PythonConfig `yaml:"python"` // Python related + Builder BuilderConfig `yaml:"builder"` // Builder related + Lives LivesConfig `yaml:"lives"` // application owner/dir + Runs RunsConfig `yaml:"runs"` // runtime environment + EntryPoint []string `yaml:"entrypoint"` // entry-point executable } // Merge takes another CommonConfig and merges its fields this one's. @@ -32,7 +31,6 @@ func (cc *CommonConfig) Merge(cc2 CommonConfig) { cc.Builder.Merge(cc2.Builder) cc.Lives.Merge(cc2.Lives) cc.Runs.Merge(cc2.Runs) - cc.SharedVolume.Merge(cc2.SharedVolume) if len(cc.EntryPoint) < 1 { cc.EntryPoint = cc2.EntryPoint |