containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s|kubernetes-sigs/cri-o|cri-o/cri-o|g 

Signed-off-by: Peter Hunt <pehunt@redhat.com>
This commit is contained in:
Peter Hunt 2019-05-17 11:08:14 -04:00
parent 0e20ae0b3a
commit 38333970ba
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -59,8 +59,8 @@ RUN set -x \
ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/kubernetes-sigs/cri-o.git "$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/kubernetes-sigs/cri-o.git" \ && cd "$GOPATH/src/github.com/cri-o/cri-o.git" \
&& git fetch origin --tags \ && git fetch origin --tags \
&& git checkout -q "$CRIO_COMMIT" \ && git checkout -q "$CRIO_COMMIT" \
&& make \ && make \

4
Dockerfile.centos
View File

@ -67,8 +67,8 @@ RUN set -x \
ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/kubernetes-sigs/cri-o.git "$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/kubernetes-sigs/cri-o.git" \ && cd "$GOPATH/src/github.com/cri-o/cri-o.git" \
&& git fetch origin --tags \ && git fetch origin --tags \
&& git checkout -q "$CRIO_COMMIT" \ && git checkout -q "$CRIO_COMMIT" \
&& make \ && make \

4
Dockerfile.fedora
View File

@ -71,8 +71,8 @@ RUN set -x \
ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/kubernetes-sigs/cri-o.git "$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/kubernetes-sigs/cri-o.git" \ && cd "$GOPATH/src/github.com/cri-o/cri-o.git" \
&& git fetch origin --tags \ && git fetch origin --tags \
&& git checkout -q "$CRIO_COMMIT" \ && git checkout -q "$CRIO_COMMIT" \
&& make \ && make \

4
README.md
View File

@ -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. * Specializing in signing and pushing images to various storage backends.
See [Skopeo](https://github.com/containers/skopeo/) for those tasks. See [Skopeo](https://github.com/containers/skopeo/) for those tasks.
* Container runtimes daemons for working with the Kubernetes CRI interface. * 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 * Supporting `docker-compose`. We believe that Kubernetes is the defacto
standard for composing Pods and for orchestrating containers, making standard for composing Pods and for orchestrating containers, making
Kubernetes YAML a defacto standard file format. Hence, Podman allows the 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) - 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) - Networking: Networking support through use of [CNI](https://github.com/containernetworking/cni)
- Builds: Builds are supported via [Buildah](https://github.com/containers/buildah). - 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 ## Podman Information for Developers

4
contrib/cirrus/lib.sh
View File

@ -287,9 +287,9 @@ install_buildah() {
install_conmon(){ install_conmon(){
echo "Installing conmon from commit $CRIO_COMMIT" echo "Installing conmon from commit $CRIO_COMMIT"
req_env_var GOPATH 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" 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" cd "$DEST"
ooe.sh git fetch origin --tags ooe.sh git fetch origin --tags
ooe.sh git checkout -q "$CRIO_COMMIT" ooe.sh git checkout -q "$CRIO_COMMIT"

4
contrib/spec/podman.spec.in
View File

@ -33,7 +33,7 @@
%global shortcommit0 %(c=%{commit0}; echo ${c:0:8}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:8})
# People want conmon packaged with the copr rpm # 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 git_conmon https://%{import_path_conmon}
%global commit_conmon 4cd5a7c60349be0678d9f1b0657683324c1a2726 %global commit_conmon 4cd5a7c60349be0678d9f1b0657683324c1a2726
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
@ -375,7 +375,7 @@ pushd crio
mkdir _output mkdir _output
pushd _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} ln -s $(dirs +1 -l) src/%{import_path_conmon}
popd popd

2
pkg/hooks/0.1.0/hook.go
View File

@ -19,7 +19,7 @@ type Hook struct {
Hook *string `json:"hook"` Hook *string `json:"hook"`
Arguments []string `json:"arguments,omitempty"` 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"` Stages []string `json:"stages"`
Stage []string `json:"stage"` Stage []string `json:"stage"`

2
transfer.md
View File

@ -98,7 +98,7 @@ Those Docker commands currently do not have equivalents in `podman`:
| `docker secret` || | `docker secret` ||
| `docker service` || | `docker service` ||
| `docker stack` || | `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 | `docker volume` | podman currently supports file volumes. Future enhancement planned to support Docker Volumes Plugins
## Missing commands in Docker ## Missing commands in Docker