Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up farm-build miscommit #20753

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/markdown/options/add-host.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
####> This option file is used in:
####> podman build, create, pod create, run
####> podman build, create, farm build, pod create, run
####> If file is edited, make sure the changes
####> are applicable to all of those.
#### **--add-host**=*host:ip*
Expand Down
9 changes: 9 additions & 0 deletions docs/source/markdown/options/no-hostname.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
####> This option file is used in:
####> podman build, farm build
####> If file is edited, make sure the changes
####> are applicable to all of those.
#### **--no-hostname**

Do not create the _/etc/hostname_ file in the container for RUN instructions.

By default, Buildah manages the _/etc/hostname_ file, adding the container's own hostname. When the **--no-hostname** option is set, the image's _/etc/hostname_ will be preserved unmodified if it exists.
6 changes: 1 addition & 5 deletions docs/source/markdown/podman-build.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,7 @@ This option is not supported on the remote client, including Mac and Windows

@@option no-cache

#### **--no-hostname**

Do not create the _/etc/hostname_ file in the container for RUN instructions.

By default, Buildah manages the _/etc/hostname_ file, adding the container's own hostname. When the **--no-hostname** option is set, the image's _/etc/hostname_ will be preserved unmodified if it exists.
@@option no-hostname

@@option no-hosts

Expand Down
6 changes: 5 additions & 1 deletion docs/source/markdown/podman-farm-build.1.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ If no farm is specified, the build will be sent out to all the nodes that `podma

## OPTIONS

@@option add-host

@@option annotation.image

@@option authfile
Expand Down Expand Up @@ -121,7 +123,7 @@ It does not affect _/etc/resolv.conf_ in the final image.

@@option layers

#### **--local**
#### **--local**, **-l**

Build image on local machine as well as on farm nodes.

Expand All @@ -135,6 +137,8 @@ Build image on local machine as well as on farm nodes.

@@option no-cache

@@option no-hostname

@@option no-hosts

This option conflicts with **--add-host**.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/markdown/podman-farm-list.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ List all the existing farms.

## OPTIONS

#### **--format**, **-f**=*format*
#### **--format**=*format*

Change the default output format. This can be of a supported type like 'json' or a Go template.
Valid placeholders for the Go template listed below:
Expand Down
2 changes: 1 addition & 1 deletion hack/xref-helpmsgs-manpages
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ for my $line (split "\n", $Format_Exceptions) {
# added, with a --format option that does not autocomplete '{{.',
# let's make sure it gets extra eyeballs.
my %Format_Option_Is_Special = map { $_ => 1 } (
'build', 'image build', # oci | docker
'build', 'farm build', 'image build', # oci | docker
'commit', 'container commit', # " " " "
'diff', 'container diff', 'image diff', # only supports "json"
'generate systemd', # " " " "
Expand Down