diff options
| author | umohnani8 <umohnani@redhat.com> | 2018-05-01 13:25:30 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-01 20:23:45 +0000 |
| commit | e98ad5751d12b6ef052803b30fd397101952294e (patch) | |
| tree | 9e6c0ab61205f1e26c417f5ebfdb393268f94c6a /vendor/github.com/projectatomic/buildah/run.go | |
| parent | 7a0a8552cb4af7af6fc6fb458fd41776f57f543c (diff) | |
| download | podman-e98ad5751d12b6ef052803b30fd397101952294e.tar.gz podman-e98ad5751d12b6ef052803b30fd397101952294e.tar.bz2 podman-e98ad5751d12b6ef052803b30fd397101952294e.zip | |
Vendor in latest buildah
Adds in --iidfile flag to podman build.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #707
Approved by: mheon
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/run.go')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/run.go | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/vendor/github.com/projectatomic/buildah/run.go b/vendor/github.com/projectatomic/buildah/run.go index 12312f6a4..b45a0e3a6 100644 --- a/vendor/github.com/projectatomic/buildah/run.go +++ b/vendor/github.com/projectatomic/buildah/run.go @@ -19,6 +19,7 @@ import ( "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" + "github.com/projectatomic/libpod/pkg/secrets" "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh/terminal" ) @@ -197,20 +198,14 @@ func (b *Builder) setupMounts(mountPoint string, spec *specs.Spec, optionMounts } // Add secrets mounts - mountsFiles := []string{OverrideMountsFile, b.DefaultMountsFilePath} - for _, file := range mountsFiles { - secretMounts, err := secretMounts(file, b.MountLabel, cdir) - if err != nil { - logrus.Warn("error mounting secrets, skipping...") + secretMounts := secrets.SecretMounts(b.MountLabel, cdir, b.DefaultMountsFilePath) + for _, mount := range secretMounts { + if haveMount(mount.Destination) { continue } - for _, mount := range secretMounts { - if haveMount(mount.Destination) { - continue - } - mounts = append(mounts, mount) - } + mounts = append(mounts, mount) } + // Add temporary copies of the contents of volume locations at the // volume locations, unless we already have something there. for _, volume := range builtinVolumes { |