opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9094 from rhatdan/mount

Browse Source 
Pass DefaultMountsFile to podman build
This commit is contained in:
OpenShift Merge Robot
2021-01-26 10:13:56 +01:00
committed by GitHub
parent 6ba8819d33 97f5e9458c
commit 79565d1af1
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/podman/images/build.go
View File

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

2
test/e2e/run_test.go
View File

@ -669,7 +669,7 @@ USER bin`
}) })
It("podman run with secrets", func() { 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") containersDir := filepath.Join(podmanTest.TempDir, "containers")
err := os.MkdirAll(containersDir, 0755) err := os.MkdirAll(containersDir, 0755)
Expect(err).To(BeNil()) Expect(err).To(BeNil())

6
test/system/070-build.bats
View File

@ -188,8 +188,7 @@ ADD mycmd /bin/mydefaultcmd
RUN chmod 755 /bin/mydefaultcmd RUN chmod 755 /bin/mydefaultcmd
RUN chown 2:3 /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"] CMD ["/bin/mydefaultcmd","$s_echo"]
EOF EOF
@ -201,8 +200,7 @@ EOF
local iid="${lines[-1]}" local iid="${lines[-1]}"
# Make sure 'podman build' had the secret mounted # 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 if is_remote; then
ENVHOST="" ENVHOST=""