Skip to content

Commit

Permalink
Merge pull request containers#4064 from TomSweeneyRedHat/dev/tsweeney…
Browse files Browse the repository at this point in the history
…/tutfix

Move rootless and Mac to Tutorials page
  • Loading branch information
openshift-merge-robot authored Sep 20, 2019
2 parents e155162 + 9f84d2e commit 45b0725
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ includes tables showing Docker commands and their Podman equivalent commands.
**[Tutorials](docs/tutorials)**
Tutorials on using Podman.

**[Remote Client](remote_client.md)**
**[Remote Client](https://github.com/containers/libpod/blob/master/docs/tutorials/remote_client.md)**
A brief how-to on using the Podman remote-client.

**[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)**
A tutorial showing the setup and configuration necessary to run Rootless Podman.

**[Release Notes](RELEASE_NOTES.md)**
Expand Down
8 changes: 6 additions & 2 deletions docs/tutorials/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ Learn how to setup Podman and perform some basic commands with the utility.

The steps required to setup rootless Podman are enumerated.

**[Setup on OS X](https://github.com/containers/libpod/blob/master/mac_client.md)**
**[Setup on OS X](https://github.com/containers/libpod/blob/master/doc/tutorials/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
Special setup for running the Podman remote client on a Mac and connecting to Podman running on a Linux VM are documented

**[Remote Client](https://github.com/containers/libpod/blob/master/doc/tutorials/remote_client.md)**

A brief how-to on using the Podman remote-client.
File renamed without changes.
4 changes: 2 additions & 2 deletions remote_client.md → docs/tutorials/remote_client.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ system as a user with privileges to the varlink socket (more on this later).

## Building the remote client
At this time, the remote-client is not being packaged for any distribution. It must be built from
source. To set up your build environment, see [Installation notes](install.md) and follow the
section [Building from scratch](install.md#building-from-scratch). Once you can successfully
source. To set up your build environment, see [Installation notes](https://github.com/containers/libpod/blob/master/install.md) and follow the
section [Building from scratch](https://github.com/containers/libpod/blob/master/install.md#building-from-scratch). Once you can successfully
build the regular Podman binary, you can now build the remote-client.
```
$ make podman-remote
Expand Down

0 comments on commit 45b0725

Please sign in to comment.