diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-26 10:13:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 10:13:56 +0100 |
| commit | 79565d1af18f07754e067b7203f42122d8fc03a9 (patch) | |
| tree | c0869382db971ef17d8942b7dee5f51aee754dca | |
| parent | 6ba8819d336ed3514b57c5818123ddfac80555ef (diff) | |
| parent | 97f5e9458c8d618989e5ff386620bfee35942df3 (diff) | |
| download | podman-79565d1af18f07754e067b7203f42122d8fc03a9.tar.gz podman-79565d1af18f07754e067b7203f42122d8fc03a9.tar.bz2 podman-79565d1af18f07754e067b7203f42122d8fc03a9.zip | |
Merge pull request #9094 from rhatdan/mount
Pass DefaultMountsFile to podman build
| -rw-r--r-- | cmd/podman/images/build.go | 8 | ||||
| -rw-r--r-- | test/e2e/run_test.go | 2 | ||||
| -rw-r--r-- | test/system/070-build.bats | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 1029e03d1..4219e325b 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -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, diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 19060ecdc..caeaf190e 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -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()) diff --git a/test/system/070-build.bats b/test/system/070-build.bats index 9e5e3ee1d..05518d8fc 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -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="" |