From cb0d89c56e5a6515a2f79e041a0f7e3937ab087d Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 17 May 2019 12:48:11 -0400 Subject: Use containers/conmon There were some build issues updating cri-o to cri-o/cri-o. Since the only thing we need cri-o for is conmon, we should just build using conmon. Signed-off-by: Peter Hunt --- Dockerfile.centos | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Dockerfile.centos') diff --git a/Dockerfile.centos b/Dockerfile.centos index 0a1d84bce..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/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 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" -- cgit v1.2.3-54-g00ecf