summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-19 03:50:11 +0200
committerGitHub <noreply@github.com>2019-09-19 03:50:11 +0200
commit6789428265a0d9d92df6f6d28a138241dbe86456 (patch)
tree87930a3b2bcf75879c6156b1d192d7295a1f82bf
parentfe48b9e036dc1a05294b2bb3df5d9b23256c6c55 (diff)
parente3a343e23f487490c95bbdbd8f866711cd8038ea (diff)
downloadpodman-6789428265a0d9d92df6f6d28a138241dbe86456.tar.gz
podman-6789428265a0d9d92df6f6d28a138241dbe86456.tar.bz2
podman-6789428265a0d9d92df6f6d28a138241dbe86456.zip
Merge pull request #4040 from mheon/mac_tutorial_links
Add links to the Mac tutorial in the main tutorial
-rw-r--r--docs/tutorials/README.md6
-rw-r--r--docs/tutorials/podman_tutorial.md3
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/tutorials/README.md b/docs/tutorials/README.md
index 925cfb970..5dc01f794 100644
--- a/docs/tutorials/README.md
+++ b/docs/tutorials/README.md
@@ -8,6 +8,10 @@
Learn how to setup Podman and perform some basic commands with the utility.
-**[Basic Setup and Use of Podman in a Rootless environment.](https://github.com/containers/libpod/blob/master/docs/tutorials/rootless_tutorial.md).
+**[Basic Setup and Use of Podman in a Rootless environment.](https://github.com/containers/libpod/blob/master/docs/tutorials/rootless_tutorial.md).**
The steps required to setup rootless Podman are enumerated.
+
+**[Setup on OS X](https://github.com/containers/libpod/blob/master/mac_client.md)**
+
+Special setup for running the Podman remote client on a Mac and connecting to Podman running on a Linux VM are documented \ No newline at end of file
diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md
index d2f8e08fa..559d25d6a 100644
--- a/docs/tutorials/podman_tutorial.md
+++ b/docs/tutorials/podman_tutorial.md
@@ -5,6 +5,9 @@ Podman is a utility provided as part of the libpod library. It can be used to c
containers. The following tutorial will teach you how to set up Podman and perform some basic
commands with Podman.
+If you are running on a Mac, you should instead follow the [Mac tutorial](https://github.com/containers/libpod/blob/master/mac_client.md)
+to set up the remote Podman client.
+
**NOTE**: the code samples are intended to be run as a non-root user, and use `sudo` where
root escalation is required.