diff options
| author | Dan Duvall <dduvall@wikimedia.org> | 2017-06-07 12:36:46 -0700 |
|---|---|---|
| committer | Dan Duvall <dduvall@wikimedia.org> | 2017-06-12 09:22:56 -0700 |
| commit | b6c3ad2aac5263ac7eb7c1c34dcd55075c8fbd04 (patch) | |
| tree | 6c736b918eb4a098790571909105183a5bb8ab58 /docker | |
| parent | a3124c04207a5fb7815a407f1978a91c54d22f7b (diff) | |
| download | blubber-b6c3ad2aac5263ac7eb7c1c34dcd55075c8fbd04.tar.gz | |
Fix variant expansion for bool config fields
Summary:
Refactored bool config fields to use a new `config.Flag` type that keeps
track of whether it was set by unmarshalled data or merged from another
instance, fixing the behavior of these fields when overwritten by
variants.
Fixes T166353
Test Plan: Run config unit tests (`cd config; go test`)
Reviewers: thcipriani, Joe, hashar, mobrovac, mmodell, #release-engineering-team
Reviewed By: mobrovac
Tags: #release-engineering-team
Maniphest Tasks: T166353
Differential Revision: https://phabricator.wikimedia.org/D680
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/compiler.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/compiler.go b/docker/compiler.go index 76b52a1..9f1e5d1 100644 --- a/docker/compiler.go +++ b/docker/compiler.go @@ -49,7 +49,7 @@ func CompileStage(buffer *bytes.Buffer, stage string, vcfg *config.VariantConfig CompilePhase(buffer, vcfg, build.PhasePreInstall) - if vcfg.SharedVolume { + if vcfg.SharedVolume.True { Writeln(buffer, "VOLUME [\"", vcfg.Runs.In, "\"]") } else { Writeln(buffer, "COPY . \"", vcfg.Runs.In, "\"") |