diff options
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | Dockerfile.centos | 4 | ||||
| -rw-r--r-- | Dockerfile.fedora | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | contrib/cirrus/lib.sh | 4 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 4 | ||||
| -rw-r--r-- | pkg/hooks/0.1.0/hook.go | 2 | ||||
| -rw-r--r-- | transfer.md | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/Dockerfile b/Dockerfile index 767e64570..2d1eedc90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,8 +59,8 @@ RUN set -x \ ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/kubernetes-sigs/cri-o.git "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \ - && cd "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \ + && git clone https://github.com/cri-o/cri-o.git "$GOPATH/src/github.com/cri-o/cri-o.git" \ + && cd "$GOPATH/src/github.com/cri-o/cri-o.git" \ && git fetch origin --tags \ && git checkout -q "$CRIO_COMMIT" \ && make \ diff --git a/Dockerfile.centos b/Dockerfile.centos index 605dc9df4..0a1d84bce 100644 --- a/Dockerfile.centos +++ b/Dockerfile.centos @@ -67,8 +67,8 @@ RUN set -x \ ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/kubernetes-sigs/cri-o.git "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \ - && cd "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \ + && git clone https://github.com/cri-o/cri-o.git "$GOPATH/src/github.com/cri-o/cri-o.git" \ + && cd "$GOPATH/src/github.com/cri-o/cri-o.git" \ && git fetch origin --tags \ && git checkout -q "$CRIO_COMMIT" \ && make \ diff --git a/Dockerfile.fedora b/Dockerfile.fedora index d4bcc11ea..6f0482c63 100644 --- a/Dockerfile.fedora +++ b/Dockerfile.fedora @@ -71,8 +71,8 @@ RUN set -x \ ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 RUN set -x \ && export GOPATH="$(mktemp -d)" \ - && git clone https://github.com/kubernetes-sigs/cri-o.git "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \ - && cd "$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" \ + && git clone https://github.com/cri-o/cri-o.git "$GOPATH/src/github.com/cri-o/cri-o.git" \ + && cd "$GOPATH/src/github.com/cri-o/cri-o.git" \ && git fetch origin --tags \ && git checkout -q "$CRIO_COMMIT" \ && make \ @@ -44,7 +44,7 @@ Any recent Podman release should be able to run rootless without any additional * Specializing in signing and pushing images to various storage backends. See [Skopeo](https://github.com/containers/skopeo/) for those tasks. * Container runtimes daemons for working with the Kubernetes CRI interface. - [CRI-O](https://github.com/kubernetes-sigs/cri-o) specializes in that. + [CRI-O](https://github.com/cri-o/cri-o) specializes in that. * Supporting `docker-compose`. We believe that Kubernetes is the defacto standard for composing Pods and for orchestrating containers, making Kubernetes YAML a defacto standard file format. Hence, Podman allows the @@ -67,7 +67,7 @@ The plan is to use OCI projects and best of breed libraries for different aspect - Storage: Container and image storage is managed by [containers/storage](https://github.com/containers/storage) - Networking: Networking support through use of [CNI](https://github.com/containernetworking/cni) - Builds: Builds are supported via [Buildah](https://github.com/containers/buildah). -- Conmon: [Conmon](https://github.com/kubernetes-sigs/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package +- Conmon: [Conmon](https://github.com/cri-o/cri-o) is a tool for monitoring OCI runtimes. It is part of the CRI-O package ## Podman Information for Developers diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index f422fe935..667e24fd1 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -287,9 +287,9 @@ install_buildah() { install_conmon(){ echo "Installing conmon from commit $CRIO_COMMIT" req_env_var GOPATH CRIO_COMMIT - DEST="$GOPATH/src/github.com/kubernetes-sigs/cri-o.git" + DEST="$GOPATH/src/github.com/cri-o/cri-o.git" rm -rf "$DEST" - ooe.sh git clone https://github.com/kubernetes-sigs/cri-o.git "$DEST" + ooe.sh git clone https://github.com/cri-o/cri-o.git "$DEST" cd "$DEST" ooe.sh git fetch origin --tags ooe.sh git checkout -q "$CRIO_COMMIT" diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 5e5789cf5..bb469d3b5 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -33,7 +33,7 @@ %global shortcommit0 %(c=%{commit0}; echo ${c:0:8}) # People want conmon packaged with the copr rpm -%global import_path_conmon github.com/kubernetes-sigs/cri-o +%global import_path_conmon github.com/cri-o/cri-o %global git_conmon https://%{import_path_conmon} %global commit_conmon 4cd5a7c60349be0678d9f1b0657683324c1a2726 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) @@ -375,7 +375,7 @@ pushd crio mkdir _output pushd _output -mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers} +mkdir -p src/%{provider}.%{provider_tld}/{cri-o,opencontainers} ln -s $(dirs +1 -l) src/%{import_path_conmon} popd diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go index 49d833aa8..ba68b0f10 100644 --- a/pkg/hooks/0.1.0/hook.go +++ b/pkg/hooks/0.1.0/hook.go @@ -19,7 +19,7 @@ type Hook struct { Hook *string `json:"hook"` Arguments []string `json:"arguments,omitempty"` - // https://github.com/kubernetes-sigs/cri-o/pull/1235 + // https://github.com/cri-o/cri-o/pull/1235 Stages []string `json:"stages"` Stage []string `json:"stage"` diff --git a/transfer.md b/transfer.md index df91cdf21..79b6d3461 100644 --- a/transfer.md +++ b/transfer.md @@ -98,7 +98,7 @@ Those Docker commands currently do not have equivalents in `podman`: | `docker secret` || | `docker service` || | `docker stack` || -| `docker swarm` | podman does not support swarm. We support Kubernetes for orchestration using [CRI-O](https://github.com/kubernetes-sigs/cri-o).| +| `docker swarm` | podman does not support swarm. We support Kubernetes for orchestration using [CRI-O](https://github.com/cri-o/cri-o).| | `docker volume` | podman currently supports file volumes. Future enhancement planned to support Docker Volumes Plugins ## Missing commands in Docker |