Skip to content

Commit

Permalink
Merge #2456
Browse files Browse the repository at this point in the history
2456: switch containers/libpod to containers/podman r=vrothberg a=rhatdan

Signed-off-by: Daniel J Walsh <[email protected]>

<!--
Thanks for sending a pull request!

Please make sure you've read and understood our contributing guidelines
(https://github.com/containers/buildah/blob/master/CONTRIBUTING.md) as well as ensuring
that all your commits are signed with `git commit -s`.
-->

#### What type of PR is this?

<!--
Please label this pull request according to what type of issue you are
addressing, especially if this is a release targeted pull request.

Uncomment only one `/kind <>` line, hit enter to put that in a new line, and
remove leading whitespace from that line:
-->

> /kind api-change
> /kind bug
> /kind cleanup
> /kind deprecation
> /kind design
> /kind documentation
> /kind failing-test 
> /kind feature
> /kind flake
> /kind other

#### What this PR does / why we need it:

#### How to verify it

#### Which issue(s) this PR fixes:

<!--
Automatically closes linked issue when PR is merged.
Uncomment the following comment block and include the issue
number or None on one line.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`, or `None`.
-->

<!--
Fixes #
or
None
-->

#### Special notes for your reviewer:

#### Does this PR introduce a user-facing change?

<!--
If no, just write `None` in the release-note block below. If yes, a release note
is required: Enter your extended release note in the block below. If the PR
requires additional action from users switching to the new release, include the
string "action required".

For more information on release notes please follow the kubernetes model:
https://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note

```



Co-authored-by: Daniel J Walsh <[email protected]>
  • Loading branch information
bors[bot] and rhatdan authored Jul 14, 2020
2 parents 8199cfe + a3f9c3c commit 13f190e
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
####
# GCE project where images live
IMAGE_PROJECT: "libpod-218412"
# See https://github.com/containers/libpod/blob/master/contrib/cirrus/README.md#test_build_cache_images_task-task
# See https://github.com/containers/podman/blob/master/contrib/cirrus/README.md#test_build_cache_images_task-task
FEDORA_NAME: "fedora-32"
PRIOR_FEDORA_NAME: "fedora-31"
UBUNTU_NAME: "ubuntu-20"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Buildah and Podman are two complementary open-source projects that are
available on most Linux platforms and both projects reside at
[GitHub.com](https://github.com) with Buildah
[here](https://github.com/containers/buildah) and Podman
[here](https://github.com/containers/libpod). Both, Buildah and Podman are
[here](https://github.com/containers/podman). Both, Buildah and Podman are
command line tools that work on Open Container Initiative (OCI) images and
containers. The two projects differentiate in their specialization.

Expand Down
2 changes: 1 addition & 1 deletion contrib/buildahimage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ using the latest Fedora and then Buildah is installed into them:

## Sample Usage

Although not required, it is suggested that [Podman](https://github.com/containers/libpod) be used with these container images.
Although not required, it is suggested that [Podman](https://github.com/containers/podman) be used with these container images.

```
podman pull docker://quay.io/buildah/stable:latest
Expand Down
13 changes: 6 additions & 7 deletions docs/containertools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The tools are:

* [Buildah](https://github.com/containers/buildah)
* [CRI-O](https://github.com/kubernetes-sigs/cri-o)
* [Podman](https://github.com/containers/libpod)
* [Podman](https://github.com/containers/podman)
* [Skopeo](https://github.com/containers/skopeo)

## Buildah
Expand All @@ -36,11 +36,10 @@ management, monitoring, logging and resource isolation as required by CRI.

## Podman

Podman is a command line tool that resides in the [libpod](https://github.com/containers/libpod) project.
Podman allows for full management of a container's lifecycle from creation through removal. It supports
multiple image formats including both the Docker and OCI image formats. Support for pods is provided
allowing pods to manage groups of containers together. Podman also supports trust
and image verification when pulling images along with resource isolation of containers and pods.
[Podman](https://github.com/containers/podman) allows for full management of a container's lifecycle from creation
through removal. It supports multiple image formats including both the Docker and OCI image formats. Support for
pods is provided allowing pods to manage groups of containers together. Podman also supports trust and image
verification when pulling images along with resource isolation of containers and pods.

## Skopeo

Expand All @@ -57,7 +56,7 @@ for authentication.
Buildah and Podman are two complementary Open-source projects that are available on
most Linux platforms and both projects reside at [GitHub.com](https://github.com)
with Buildah [here](https://github.com/containers/buildah) and
Podman [here](https://github.com/containers/libpod). Both Buildah and Podman are
Podman [here](https://github.com/containers/podman). Both Buildah and Podman are
command line tools that work on OCI images and containers. The two projects
differentiate in their specialization.

Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials/01-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Then install buildah by running:

## Rootless User Configuration

If you plan to run Buildah as a user without root privileges, i.e. a "rootless user", the administrator of the system might have to do a bit of additional configuration beforehand. The setup required for this is listed on the Podman GitHub site [here](https://github.com/containers/libpod/blob/master/docs/tutorials/rootless_tutorial.md). Buildah has the same setup and configuration requirements that Podman does for rootless users.
If you plan to run Buildah as a user without root privileges, i.e. a "rootless user", the administrator of the system might have to do a bit of additional configuration beforehand. The setup required for this is listed on the Podman GitHub site [here](https://github.com/containers/podman/blob/master/docs/tutorials/rootless_tutorial.md). Buildah has the same setup and configuration requirements that Podman does for rootless users.

## Post Installation Verification

Expand Down Expand Up @@ -131,7 +131,7 @@ Change the permissions on the file so that it can be run:
# chmod +x runecho.sh


With `buildah` files can be copied into the new image. We can then use `buildah run` to run that command within the container by specifying the command. We can also configure the image to run the command directly using [Podman](https://github.com/containers/libpod) and its `podman run` command. In short the `buildah run` command is equivalent to the "RUN" command in a Dockerfile, whereas `podman run` is equivalent to the `docker run` command. Now let's copy this new command into the container's `/usr/bin` directory and configure the container to run the command when the container is run via podman:
With `buildah` files can be copied into the new image. We can then use `buildah run` to run that command within the container by specifying the command. We can also configure the image to run the command directly using [Podman](https://github.com/containers/podman) and its `podman run` command. In short the `buildah run` command is equivalent to the "RUN" command in a Dockerfile, whereas `podman run` is equivalent to the `docker run` command. Now let's copy this new command into the container's `/usr/bin` directory and configure the container to run the command when the container is run via podman:

# To test with Podman, first install via:
# dnf -y install podman
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/03-on-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ If you have any suggestions or issues please post them at the [Buildah Issues pa

For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah).

[GitHub]: https://github.com/containers/libpod/
[GitHub]: https://github.com/containers/podman/
[image specification]: https://github.com/opencontainers/runtime-spec
[Introduction Tutorial]: 01-intro.md
[Open Container Initiative]: https://www.opencontainers.org/
2 changes: 1 addition & 1 deletion tests/conformance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Conformance tests use Docker CE to check the images built with Buildah. Install

### Install Podman

[Podman](https://github.com/containers/libpod) is used to push images built with Buildah to the docker daemon. It can be installed with dnf or yum in Fedora, RHEL and CentOS, it also can be installed from source code. If you want to install Podman from source code, please follow the [libpod Installation Instructions](https://github.com/containers/libpod/blob/master/install.md).
[Podman](https://github.com/containers/podman) is used to push images built with Buildah to the docker daemon. It can be installed with dnf or yum in Fedora, RHEL and CentOS, it also can be installed from source code. If you want to install Podman from source code, please follow the [libpod Installation Instructions](https://github.com/containers/podman/blob/master/install.md).

### Install container-diff

Expand Down
2 changes: 1 addition & 1 deletion troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ the `buildah run` command will not complete and an error will be raised.

#### Solution
There are two solutions to this problem. The
[`podman run`](https://github.com/containers/libpod/blob/master/docs/podman-run.1.md)
[`podman run`](https://github.com/containers/podman/blob/master/docs/podman-run.1.md)
command can be used in place of `buildah run`. To still use `buildah run`, surround
the command with single quotes and use `bash -c`. The previous examples would be
changed to:
Expand Down

0 comments on commit 13f190e

Please sign in to comment.