aboutsummaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-28 21:07:43 +0200
committerGitHub <noreply@github.com>2019-05-28 21:07:43 +0200
commit8649dbdc11bc14feb59794d76ba197771d8a6d51 (patch)
tree30a70d58b5c2e967565d95712ce586fcfe1208a2 /Dockerfile
parentbc7afd6d71da4173e4894ff352667a25987fa2ea (diff)
parentf2c8391ecc1d95ee192ca93bd69fc589f667fcf9 (diff)
downloadpodman-8649dbdc11bc14feb59794d76ba197771d8a6d51.tar.gz
podman-8649dbdc11bc14feb59794d76ba197771d8a6d51.tar.bz2
podman-8649dbdc11bc14feb59794d76ba197771d8a6d51.zip
Merge pull request #3210 from haircommander/conmon-0.2.0
bump conmon to v0.2.0
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index f3afd5e25..4fc85e959 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install conmon
-ENV CONMON_COMMIT f02c053eb37010fc76d1e2966de7f2cb9f969ef2
+ENV CONMON_COMMIT 59952292a3b07ac125575024ae21956efe0ecdfb
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \