diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-14 09:09:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 09:09:22 -0700 |
| commit | b625c47ae5170e09d354b6e4e3d40445642102c9 (patch) | |
| tree | 14354d14d6afe67e79b67ed76a36ceac55a9b9b8 | |
| parent | 296c61d896002e8d80597e306dc497d6e41cbb92 (diff) | |
| parent | d033452b3d7397c769d9449128c972b3b9e386b9 (diff) | |
| download | podman-b625c47ae5170e09d354b6e4e3d40445642102c9.tar.gz podman-b625c47ae5170e09d354b6e4e3d40445642102c9.tar.bz2 podman-b625c47ae5170e09d354b6e4e3d40445642102c9.zip | |
Merge pull request #2546 from TomSweeneyRedHat/dev/tsweeney/commoncontainers
Replace skopeo-containers with containers-common
| -rw-r--r-- | Dockerfile.CentOS | 2 | ||||
| -rw-r--r-- | Dockerfile.Fedora | 2 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 2 | ||||
| -rw-r--r-- | docs/tutorials/podman_tutorial.md | 2 | ||||
| -rw-r--r-- | install.md | 2 | ||||
| -rw-r--r-- | troubleshooting.md | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Dockerfile.CentOS b/Dockerfile.CentOS index be4ae3eaf..605dc9df4 100644 --- a/Dockerfile.CentOS +++ b/Dockerfile.CentOS @@ -15,7 +15,7 @@ RUN yum -y install btrfs-progs-devel \ libassuan-devel \ libseccomp-devel \ libselinux-devel \ - skopeo-containers \ + containers-common \ runc \ make \ ostree-devel \ diff --git a/Dockerfile.Fedora b/Dockerfile.Fedora index aeee9c3cf..e38e2e056 100644 --- a/Dockerfile.Fedora +++ b/Dockerfile.Fedora @@ -16,7 +16,7 @@ RUN dnf -y install btrfs-progs-devel \ libassuan-devel \ libseccomp-devel \ libselinux-devel \ - skopeo-containers \ + containers-common \ runc \ make \ ostree-devel \ diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index 16d5eda67..e44c2fd4f 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -31,7 +31,7 @@ RUN dnf -y install \ python3-pytoml \ python3-pyyaml \ python3-varlink \ - skopeo-containers \ + containers-common \ slirp4netns \ rsync \ which \ diff --git a/docs/tutorials/podman_tutorial.md b/docs/tutorials/podman_tutorial.md index 5017e61cd..bfff90016 100644 --- a/docs/tutorials/podman_tutorial.md +++ b/docs/tutorials/podman_tutorial.md @@ -34,7 +34,7 @@ acquire the source, and build it. ```console 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 \ - atomic-registries iptables skopeo-containers containernetworking-cni \ + atomic-registries iptables containers-common containernetworking-cni \ conmon ostree-devel ``` ### Building and installing podman diff --git a/install.md b/install.md index eba1ce8ea..071eeff67 100644 --- a/install.md +++ b/install.md @@ -107,7 +107,7 @@ yum install -y \ ostree-devel \ pkgconfig \ runc \ - skopeo-containers + containers-common ``` Debian, Ubuntu, and related distributions: diff --git a/troubleshooting.md b/troubleshooting.md index 74b2e76df..882afef0c 100644 --- a/troubleshooting.md +++ b/troubleshooting.md @@ -39,7 +39,7 @@ error pulling image "fedora": unable to pull fedora: error getting default regis #### 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. * i.e. `registries = ['registry.fedoraproject.org', 'quay.io', 'registry.access.redhat.com']` |