Skip to content

Commit edfb567

Browse files
committed
SRVOCF-492 Podman not podman, and split pre-req
1 parent 0109218 commit edfb567

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

modules/serverless-functions-podman-macos.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
:_content-type: PROCEDURE
66
[id="serverless-functions-podman-macos_{context}"]
7-
= Setting up podman on macOS
7+
= Setting up Podman on macOS
88

9-
To use advanced container management features, you might want to use podman with {FunctionsProductName}. To do so on macOS, you need to start the podman machine and configure the Knative (`kn`) CLI to connect to it.
9+
To use advanced container management features, you might want to use Podman with {FunctionsProductName}. To do so on macOS, you need to start the Podman machine and configure the Knative (`kn`) CLI to connect to it.
1010

1111
.Procedure
1212

13-
. Create the podman machine:
13+
. Create the Podman machine:
1414
+
1515
[source,terminal]
1616
----
1717
$ podman machine init --memory=8192 --cpus=2 --disk-size=20
1818
----
1919

20-
. Start the podman machine, which serves the Docker API on a UNIX socket:
20+
. Start the Podman machine, which serves the Docker API on a UNIX socket:
2121
+
2222
[source,terminal]
2323
----

modules/serverless-functions-podman.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
:_content-type: PROCEDURE
66
[id="serverless-functions-podman_{context}"]
7-
= Setting up podman
7+
= Setting up Podman
88

9-
To use advanced container management features, you might want to use podman with {FunctionsProductName}. To do so, you need to start the podman service and configure the Knative (`kn`) CLI to connect to it.
9+
To use advanced container management features, you might want to use Podman with {FunctionsProductName}. To do so, you need to start the Podman service and configure the Knative (`kn`) CLI to connect to it.
1010

1111
.Procedure
1212

1313
// This step might no longer be needed in the future, when automatic
1414
// podman startup is reliable.
1515
// https://github.com/openshift/openshift-docs/pull/46660/files#r907310116
16-
. Start the podman service that serves the Docker API on a UNIX socket at `${XDG_RUNTIME_DIR}/podman/podman.sock`:
16+
. Start the Podman service that serves the Docker API on a UNIX socket at `${XDG_RUNTIME_DIR}/podman/podman.sock`:
1717
+
1818
[source,terminal]
1919
----

serverless/functions/serverless-functions-setup.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ endif::[]
3434

3535
* You have the xref:../../serverless/cli_tools/installing-kn.adoc#installing-kn[Knative (`kn`) CLI] installed. Installing the Knative CLI enables the use of `kn func` commands which you can use to create and manage functions.
3636

37-
* You have installed Docker Container Engine or podman version 3.4.7 or higher, and have access to an available image registry, such as the OpenShift Container Registry.
37+
* You have installed Docker Container Engine or Podman version 3.4.7 or higher.
38+
39+
* You have access to an available image registry, such as the OpenShift Container Registry.
3840

3941
ifdef::openshift-enterprise[]
4042
* If you are using link:https://quay.io/[Quay.io] as the image registry, you must ensure that either the repository is not private, or that you have followed the {product-title} documentation on xref:../../openshift_images/managing_images/using-image-pull-secrets.adoc#images-allow-pods-to-reference-images-from-secure-registries_using-image-pull-secrets[Allowing pods to reference images from other secured registries].
@@ -61,7 +63,7 @@ include::modules/serverless-functions-podman-macos.adoc[leveloffset=+1]
6163
== Next steps
6264

6365
ifdef::openshift-enterprise[]
64-
* For more information about Docker Container Engine or podman, see xref:../../architecture/understanding-development.adoc#container-build-tool-options[Container build tool options].
66+
* For more information about Docker Container Engine or Podman, see xref:../../architecture/understanding-development.adoc#container-build-tool-options[Container build tool options].
6567
endif::[]
6668
// need to wait til build tool docs are added to OSD and ROSA for this link to work
6769
// TODO: remove these conditionals once this is available

0 commit comments

Comments
 (0)