diff --git a/.cirrus.yml b/.cirrus.yml index 3b4f6e9de58..92866262cbb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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" diff --git a/README.md b/README.md index 7589da51d2e..1605aaf7356 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/contrib/buildahimage/README.md b/contrib/buildahimage/README.md index 1d2c934290c..35fbfb3d9f2 100644 --- a/contrib/buildahimage/README.md +++ b/contrib/buildahimage/README.md @@ -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 diff --git a/docs/containertools/README.md b/docs/containertools/README.md index c0fff7cbaca..41e8e3f04c2 100644 --- a/docs/containertools/README.md +++ b/docs/containertools/README.md @@ -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 @@ -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 @@ -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. diff --git a/docs/tutorials/01-intro.md b/docs/tutorials/01-intro.md index d6b7386a2f7..f852bbaa7a9 100644 --- a/docs/tutorials/01-intro.md +++ b/docs/tutorials/01-intro.md @@ -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 @@ -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 diff --git a/docs/tutorials/03-on-build.md b/docs/tutorials/03-on-build.md index 09f56a8c1c2..f8b8125d71d 100644 --- a/docs/tutorials/03-on-build.md +++ b/docs/tutorials/03-on-build.md @@ -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/ diff --git a/tests/conformance/README.md b/tests/conformance/README.md index 2cd88ee5bb0..3673f660f96 100644 --- a/tests/conformance/README.md +++ b/tests/conformance/README.md @@ -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 diff --git a/troubleshooting.md b/troubleshooting.md index 4ff2f06c45b..afd9c640a58 100644 --- a/troubleshooting.md +++ b/troubleshooting.md @@ -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: