opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace skopeo-containers with containers-common

Browse Source 
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>

Replaces 'skopeo-containers' with 'containers-common' in the files that
I feel comfortable changing it in.  There are a number of rpm building
related files that still have it, but I was hesitant to do so.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
TomSweeneyRedHat
2019-03-05 13:27:30 -05:00
parent 296c61d896
commit d033452b3d
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.CentOS
View File

@ -15,7 +15,7 @@ RUN yum -y install btrfs-progs-devel \
libassuan-devel \ libassuan-devel \
libseccomp-devel \ libseccomp-devel \
libselinux-devel \ libselinux-devel \
skopeo-containers \ containers-common \
runc \ runc \
make \ make \
ostree-devel \ ostree-devel \

2
Dockerfile.Fedora
View File

@ -16,7 +16,7 @@ RUN dnf -y install btrfs-progs-devel \
libassuan-devel \ libassuan-devel \
libseccomp-devel \ libseccomp-devel \
libselinux-devel \ libselinux-devel \
skopeo-containers \ containers-common \
runc \ runc \
make \ make \
ostree-devel \ ostree-devel \

2
contrib/gate/Dockerfile
View File

@ -31,7 +31,7 @@ RUN dnf -y install \
python3-pytoml \ python3-pytoml \
python3-pyyaml \ python3-pyyaml \
python3-varlink \ python3-varlink \
skopeo-containers \ containers-common \
slirp4netns \ slirp4netns \
rsync \ rsync \
which \ which \

2
docs/tutorials/podman_tutorial.md
View File

@ -34,7 +34,7 @@ acquire the source, and build it.
```console ```console
sudo dnf install -y git runc libassuan-devel golang golang-github-cpuguy83-go-md2man glibc-static \ sudo dnf install -y git runc libassuan-devel golang golang-github-cpuguy83-go-md2man glibc-static \
gpgme-devel glib2-devel device-mapper-devel libseccomp-devel \ gpgme-devel glib2-devel device-mapper-devel libseccomp-devel \
atomic-registries iptables skopeo-containers containernetworking-cni \ atomic-registries iptables containers-common containernetworking-cni \
conmon ostree-devel conmon ostree-devel
``` ```
### Building and installing podman ### Building and installing podman

2
install.md
View File

@ -107,7 +107,7 @@ yum install -y \
ostree-devel \ ostree-devel \
pkgconfig \ pkgconfig \
runc \ runc \
skopeo-containers containers-common
``` ```
Debian, Ubuntu, and related distributions: Debian, Ubuntu, and related distributions:

2
troubleshooting.md
View File

@ -39,7 +39,7 @@ error pulling image "fedora": unable to pull fedora: error getting default regis
#### Solution #### Solution
* Verify that the `/etc/containers/registries.conf` file exists. If not, verify that the skopeo-containers package is installed. * Verify that the `/etc/containers/registries.conf` file exists. If not, verify that the containers-common package is installed.
* Verify that the entries in the `[registries.search]` section of the /etc/containers/registries.conf file are valid and reachable. * Verify that the entries in the `[registries.search]` section of the /etc/containers/registries.conf file are valid and reachable.
* i.e. `registries = ['registry.fedoraproject.org', 'quay.io', 'registry.access.redhat.com']` * i.e. `registries = ['registry.fedoraproject.org', 'quay.io', 'registry.access.redhat.com']`