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/variant.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/variant.go')
| -rw-r--r-- | config/variant.go | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/config/variant.go b/config/variant.go index 7886cfe..cc4d802 100644 --- a/config/variant.go +++ b/config/variant.go @@ -23,14 +23,12 @@ func (vc *VariantConfig) Merge(vc2 VariantConfig) { } // InstructionsForPhase injects build instructions related to artifact -// copying, volume definition or copying of application files, and all common -// configuration. +// copying, copying of application files, and all common configuration. // // PhaseInstall // -// If VariantConfig.Copies is not set, either copy in application files or -// define a shared volume. Otherwise, delegate to -// ArtifactsConfig.InstructionsForPhase. +// If VariantConfig.Copies is not set, copy in application files. Otherwise, +// delegate to ArtifactsConfig.InstructionsForPhase. // func (vc *VariantConfig) InstructionsForPhase(phase build.Phase) []build.Instruction { instructions := vc.CommonConfig.InstructionsForPhase(phase) @@ -53,11 +51,7 @@ func (vc *VariantConfig) InstructionsForPhase(phase build.Phase) []build.Instruc uid, gid = vc.Lives.UID, vc.Lives.GID if vc.Copies == "" { - if vc.SharedVolume.True { - instructions = append(instructions, build.Volume{vc.Lives.In}) - } else { - instructions = append(instructions, build.Copy{[]string{"."}, "."}) - } + instructions = append(instructions, build.Copy{[]string{"."}, "."}) } case build.PhasePostInstall: |