diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-17 21:49:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-17 21:49:10 +0200 |
| commit | 00ecbfc1315a62940202574fb45f2ae2f4c48b63 (patch) | |
| tree | 6a4c8c755c75d3ee215419dc21b8967f41c97be4 /Dockerfile.centos | |
| parent | ba612a098c65f11730e8436cdebe86d3b979ddf4 (diff) | |
| parent | cb0d89c56e5a6515a2f79e041a0f7e3937ab087d (diff) | |
| download | podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.tar.gz podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.tar.bz2 podman-00ecbfc1315a62940202574fb45f2ae2f4c48b63.zip | |
Merge pull request #2844 from haircommander/cri-o-update
move to cri-o/cri-o and build with containers/conmon
Diffstat (limited to 'Dockerfile.centos')
| -rw-r--r-- | Dockerfile.centos | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Dockerfile.centos b/Dockerfile.centos index 605dc9df4..47f7182b6 100644 --- a/Dockerfile.centos +++ b/Dockerfile.centos @@ -64,15 +64,14 @@ RUN set -x \ && install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/ # Install conmon -ENV CRIO_COMMIT 7a283c391abb7bd25086a8ff91dbb36ebdd24466 +ENV CONMON_COMMIT f02c053eb37010fc76d1e2966de7f2cb9f969ef2 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/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \ + && cd "$GOPATH/src/github.com/containers/conmon.git" \ && git fetch origin --tags \ - && git checkout -q "$CRIO_COMMIT" \ + && git checkout -q "$CONMON_COMMIT" \ && make \ - && make bin/conmon \ && install -D -m 755 bin/conmon /usr/libexec/podman/conmon \ && rm -rf "$GOPATH" |