summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-11 15:36:33 -0400
committerGitHub <noreply@github.com>2020-09-11 15:36:33 -0400
commit834c41da7d01acd861cb12912345a61d23ce9079 (patch)
tree011f74eca8389c5f5bf4c5344a86e8eb810b0628 /docs
parent4f040070b6e9e2213b1fb6daa1502353c90e172d (diff)
parent08cc87636e456a084f6c4e70fe183bbec956b561 (diff)
downloadpodman-834c41da7d01acd861cb12912345a61d23ce9079.tar.gz
podman-834c41da7d01acd861cb12912345a61d23ce9079.tar.bz2
podman-834c41da7d01acd861cb12912345a61d23ce9079.zip
Merge pull request #7609 from rhatdan/VENDOR
Vendor in containers/buildah 1.16.1
Diffstat (limited to 'docs')
-rw-r--r--docs/source/markdown/podman-build.1.md16
1 files changed, 7 insertions, 9 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md
index e30c2a5ef..7d0aa5001 100644
--- a/docs/source/markdown/podman-build.1.md
+++ b/docs/source/markdown/podman-build.1.md
@@ -353,15 +353,6 @@ another process.
Do not use existing cached images for the container build. Build from the start with a new set of cached layers.
-**--omit-timestamp** *bool-value*
-
-Set the create timestamp to epoch 0 to allow for deterministic builds (defaults to false).
-By default, the created timestamp is changed and written into the image manifest with every commit,
-causing the image's sha256 hash to be different even if the sources are exactly the same otherwise.
-When --omit-timestamp is set to true, the created timestamp is always set to the epoch and therefore not
-changed, allowing the image's sha256 to remain the same. All files committed to the layers of the image
-will get the epoch 0 timestamp.
-
**--os**=*string*
Set the OS to the provided value instead of the current operating system of the host.
@@ -470,6 +461,13 @@ Set the target build stage to build. When building a Containerfile with multipl
can be used to specify an intermediate build stage by name as the final stage for the resulting image.
Commands after the target stage will be skipped.
+**--timestamp** *seconds*
+
+Set the create timestamp to seconds since epoch to allow for deterministic builds (defaults to current time).
+By default, the created timestamp is changed and written into the image manifest with every commit,
+causing the image's sha256 hash to be different even if the sources are exactly the same otherwise.
+When --timestamp is set, the created timestamp is always set to the time specified and therefore not changed, allowing the image's sha256 to remain the same. All files committed to the layers of the image will be created with the timestamp.
+
**--tls-verify**=*true|false*
Require HTTPS and verify certificates when talking to container registries (defaults to true). (Not available for remote commands)