diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 15:50:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 15:50:39 +0200 |
| commit | cf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (patch) | |
| tree | 50fcb41590d74293fda6147b24a10945a5d4aec0 /Dockerfile | |
| parent | 33280d881e1bd838cf5e346e5c338a3dc992b345 (diff) | |
| parent | a06bb80b4b4b9e286fac292e80d30840878ea3f1 (diff) | |
| download | podman-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')
| -rw-r--r-- | Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 214fbeb34..cc3ee00e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ RUN set -x \ && rm -rf "$GOPATH" # 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" \ |