summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-29 17:44:52 +0100
committerGitHub <noreply@github.com>2019-10-29 17:44:52 +0100
commit59582c55b798f0a2d086981ca9a8ddd8314fd0c2 (patch)
tree543493ed3fafc42901be3f1afbbff2620a42a8cd /Dockerfile
parenta56131fef4a82824b397c94f6b7edcdb24769624 (diff)
parent49e251fc57447f79632ca5ddf37847c86ade2271 (diff)
downloadpodman-59582c55b798f0a2d086981ca9a8ddd8314fd0c2.tar.gz
podman-59582c55b798f0a2d086981ca9a8ddd8314fd0c2.tar.bz2
podman-59582c55b798f0a2d086981ca9a8ddd8314fd0c2.zip
Merge pull request #3792 from haircommander/minimum-conmon
require conmon v2.0.1
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 3c65bf5a8..4b3130245 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,7 +57,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install conmon
-ENV CONMON_COMMIT 6f3572558b97bc60dd8f8c7f0807748e6ce2c440
+ENV CONMON_COMMIT 65fe0226d85b69fc9e527e376795c9791199153d
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \