new "image" mount type

Add a new "image" mount type to `--mount`.  The source of the mount is
the name or ID of an image.  The destination is the path inside the
container.  Image mounts further support an optional `rw,readwrite`
parameter which if set to "true" will yield the mount writable inside
the container.  Note that no changes are propagated to the image mount
on the host (which in any case is read only).

Mounts are overlay mounts.  To support read-only overlay mounts, vendor
a non-release version of Buildah.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

2 files changed, 37 insertions, 12 deletions

diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index c7e00f594..f823ac565 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -507,7 +507,7 @@ Tune a container's memory swappiness behavior. Accepts an integer between 0 and
 
 Attach a filesystem mount to the container
 
-Current supported mount TYPES are `bind`, `volume`, `tmpfs` and `devpts`. <sup>[[1]](#Footnote1)</sup>
+Current supported mount TYPEs are **bind**, **volume**, **image**, **tmpfs** and **devpts**. <sup>[[1]](#Footnote1)</sup>
 
        e.g.
 
@@ -519,33 +519,46 @@ Current supported mount TYPES are `bind`, `volume`, `tmpfs` and `devpts`. <sup>[
 
        type=tmpfs,tmpfs-size=512M,destination=/path/in/container
 
+       type=image,source=fedora,destination=/fedora-image,rw=true
+
        type=devpts,destination=/dev/pts
 
        Common Options:
 
-              · src, source: mount source spec for bind and volume. Mandatory for bind.
+	      · src, source: mount source spec for bind and volume. Mandatory for bind.
+
+	      · dst, destination, target: mount destination spec.
+
+       Options specific to volume:
+
+	      · ro, readonly: true or false (default).
 
-              · dst, destination, target: mount destination spec.
+       Options specific to image:
 
-              · ro, readonly: true or false (default).
+	      · rw, readwrite: true or false (default).
 
        Options specific to bind:
 
-              · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2).
+	      · ro, readonly: true or false (default).
 
-              . bind-nonrecursive: do not setup a recursive bind mount.  By default it is recursive.
+	      · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2).
 
-              . relabel: shared, private.
+	      . bind-nonrecursive: do not setup a recursive bind mount.  By default it is recursive.
+
+	      . relabel: shared, private.
 
        Options specific to tmpfs:
 
-              · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux.
+	      · ro, readonly: true or false (default).
+
+	      · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux.
+
+	      · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux.
 
-              · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux.
+	      · tmpcopyup: Enable copyup from the image directory at the same location to the tmpfs.  Used by default.
 
-              · tmpcopyup: Enable copyup from the image directory at the same location to the tmpfs.  Used by default.
+	      · notmpcopyup: Disable copying files from the image to the tmpfs.
 
-              · notmpcopyup: Disable copying files from the image to the tmpfs.
 
 **--name**=*name*
 
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index aad179957..71f77d307 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -533,7 +533,7 @@ Tune a container's memory swappiness behavior. Accepts an integer between *0* an
 
 Attach a filesystem mount to the container
 
-Current supported mount TYPEs are **bind**, **volume**, **tmpfs** and **devpts**. <sup>[[1]](#Footnote1)</sup>
+Current supported mount TYPEs are **bind**, **volume**, **image**, **tmpfs** and **devpts**. <sup>[[1]](#Footnote1)</sup>
 
        e.g.
 
@@ -545,6 +545,8 @@ Current supported mount TYPEs are **bind**, **volume**, **tmpfs** and **devpts**
 
        type=tmpfs,tmpfs-size=512M,destination=/path/in/container
 
+       type=image,source=fedora,destination=/fedora-image,rw=true
+
        type=devpts,destination=/dev/pts
 
        Common Options:
@@ -553,10 +555,18 @@ Current supported mount TYPEs are **bind**, **volume**, **tmpfs** and **devpts**
 
 	      · dst, destination, target: mount destination spec.
 
+       Options specific to volume:
+
 	      · ro, readonly: true or false (default).
 
+       Options specific to image:
+
+	      · rw, readwrite: true or false (default).
+
        Options specific to bind:
 
+	      · ro, readonly: true or false (default).
+
 	      · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2).
 
 	      . bind-nonrecursive: do not setup a recursive bind mount.  By default it is recursive.
@@ -565,6 +575,8 @@ Current supported mount TYPEs are **bind**, **volume**, **tmpfs** and **devpts**
 
        Options specific to tmpfs:
 
+	      · ro, readonly: true or false (default).
+
 	      · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux.
 
 	      · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux.