summaryrefslogtreecommitdiff
path: root/Dockerfile.centos
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-14 05:34:39 +0200
committerGitHub <noreply@github.com>2019-06-14 05:34:39 +0200
commitd5f04e920bf0cca02c9efe25ceca7639cbf31644 (patch)
tree771bf406b309906451a43da1370870fa12ca0451 /Dockerfile.centos
parent56957db468a018063af34489f671274498b1ef28 (diff)
parentef9e0ec6cbdaf9872da0a1a16ce239cfd76a6efb (diff)
downloadpodman-d5f04e920bf0cca02c9efe25ceca7639cbf31644.tar.gz
podman-d5f04e920bf0cca02c9efe25ceca7639cbf31644.tar.bz2
podman-d5f04e920bf0cca02c9efe25ceca7639cbf31644.zip
Merge pull request #3321 from haircommander/conmon-0.3.0
bump conmon to 0.3.0
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 7f4cef963..72b926bff 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 59952292a3b07ac125575024ae21956efe0ecdfb
+ENV CONMON_COMMIT 8455ce1ef385120deb827d0f0588c04357bad4c4
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \