Merge pull request #9094 from rhatdan/mount

Pass DefaultMountsFile to podman build
This commit is contained in:
OpenShift Merge Robot
2021-01-26 10:13:56 +01:00
committed by GitHub
3 changed files with 7 additions and 9 deletions

View File

@ -423,10 +423,10 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
Ulimit: flags.Ulimit,
Volumes: flags.Volumes,
},
Compression: compression,
ConfigureNetwork: networkPolicy,
ContextDirectory: contextDir,
// DefaultMountsFilePath: FIXME: this requires global flags to be working!
Compression: compression,
ConfigureNetwork: networkPolicy,
ContextDirectory: contextDir,
DefaultMountsFilePath: containerConfig.Containers.DefaultMountsFile,
Devices: flags.Devices,
DropCapabilities: flags.CapDrop,
Err: stderr,

View File

@ -669,7 +669,7 @@ USER bin`
})
It("podman run with secrets", func() {
SkipIfRemote("--default-mount-file option is not supported in podman-remote")
SkipIfRemote("--default-mounts-file option is not supported in podman-remote")
containersDir := filepath.Join(podmanTest.TempDir, "containers")
err := os.MkdirAll(containersDir, 0755)
Expect(err).To(BeNil())

View File

@ -188,8 +188,7 @@ ADD mycmd /bin/mydefaultcmd
RUN chmod 755 /bin/mydefaultcmd
RUN chown 2:3 /bin/mydefaultcmd
#FIXME FIXME FIXME: enable if/when 'podman build' passes mounts.conf to buildah
#RUN $CAT_SECRET
RUN $CAT_SECRET
CMD ["/bin/mydefaultcmd","$s_echo"]
EOF
@ -201,8 +200,7 @@ EOF
local iid="${lines[-1]}"
# Make sure 'podman build' had the secret mounted
#FIXME FIXME: enable if/when 'podman build' passes mounts.conf to buildah
#is "$output" ".*$secret_contents.*" "podman build has /run/secrets mounted"
is "$output" ".*$secret_contents.*" "podman build has /run/secrets mounted"
if is_remote; then
ENVHOST=""