summaryrefslogtreecommitdiff
path: root/Dockerfile.centos
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-24 15:50:39 +0200
committerGitHub <noreply@github.com>2019-06-24 15:50:39 +0200
commitcf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (patch)
tree50fcb41590d74293fda6147b24a10945a5d4aec0 /Dockerfile.centos
parent33280d881e1bd838cf5e346e5c338a3dc992b345 (diff)
parenta06bb80b4b4b9e286fac292e80d30840878ea3f1 (diff)
downloadpodman-cf244d87cdb9b2cb0d8510b2ea392d928c1eb269.tar.gz
podman-cf244d87cdb9b2cb0d8510b2ea392d928c1eb269.tar.bz2
podman-cf244d87cdb9b2cb0d8510b2ea392d928c1eb269.zip
Merge pull request #3398 from haircommander/conmon-hotfix
Update conmon to include attach socket unlink
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 72b926bff..65dbefb38 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 8455ce1ef385120deb827d0f0588c04357bad4c4
+ENV CONMON_COMMIT 3e47d8dd45cdd973dbe256292d5e9c0bff195e56
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containers/conmon.git "$GOPATH/src/github.com/containers/conmon.git" \