silva
/
compose
mirror of https://github.com/viniciusfdasilva/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8904 from ndeloof/volumeZ 

type mismatch checking tmpfs conflicting options
This commit is contained in:
Ulysses Souza 2021-11-09 10:11:11 +01:00 committed by GitHub
parent d4e3f191ac 577bee955b
commit e44222664a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/compose/create.go
View File

@ -952,8 +952,8 @@ func buildMountOptions(volume types.ServiceVolumeConfig) (*mount.BindOptions, *m
if volume.Bind != nil { if volume.Bind != nil {
logrus.Warnf("mount of type `tmpfs` should not define `bind` option") logrus.Warnf("mount of type `tmpfs` should not define `bind` option")
} }
if volume.Tmpfs != nil { if volume.Volume != nil {
logrus.Warnf("mount of type `tmpfs` should not define `volumeZ` option") logrus.Warnf("mount of type `tmpfs` should not define `volume` option")
} }
return nil, nil, buildTmpfsOptions(volume.Tmpfs) return nil, nil, buildTmpfsOptions(volume.Tmpfs)
} }