summaryrefslogtreecommitdiff
path: root/Dockerfile.centos
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-07-22 21:43:59 +0200
committerGitHub <noreply@github.com>2019-07-22 21:43:59 +0200
commitcf9efa90e5dcf89e10408eae5229c4ce904d9fc7 (patch)
tree50acf3cc5fc809c135df6d7a3a1e1fbd887f26c1 /Dockerfile.centos
parent69f74f13b0d041c45bc0e0c77c6c4ee3cd4cbdd4 (diff)
parent0671dca90de97be983f13a0a5e714f825013eae4 (diff)
downloadpodman-cf9efa90e5dcf89e10408eae5229c4ce904d9fc7.tar.gz
podman-cf9efa90e5dcf89e10408eae5229c4ce904d9fc7.tar.bz2
podman-cf9efa90e5dcf89e10408eae5229c4ce904d9fc7.zip
Merge pull request #3620 from haircommander/bump-conmon
use conmon v1.0.0-rc2
Diffstat (limited to 'Dockerfile.centos')
-rw-r--r--Dockerfile.centos2
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile.centos b/Dockerfile.centos
index 65dbefb38..bbb582840 100644
--- a/Dockerfile.centos
+++ b/Dockerfile.centos
@@ -50,7 +50,7 @@ RUN set -x \
&& go get github.com/onsi/gomega/...
# Install conmon
-ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
+ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \