Unverified Commit a17905f0 authored by OpenShift Merge Robot's avatar OpenShift Merge Robot Committed by GitHub

Merge pull request #3378 from haircommander/conmon-2.0.11-1.14

[1.14] conmon: bump to 2.0.11
parents 45b00602 1368d48a
......@@ -97,7 +97,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install conmon
RUN VERSION=v2.0.0 &&\
RUN VERSION=v2.0.11 &&\
git clone https://github.com/containers/conmon &&\
cd conmon && git checkout $VERSION &&\
make && make PREFIX=/ install && cd .. && rm -rf conmon/
......
......@@ -4,7 +4,7 @@
git:
repo: "https://github.com/containers/conmon.git"
dest: "{{ ansible_env.GOPATH }}/src/github.com/containers/conmon"
version: "6f3572558b97bc60dd8f8c7f0807748e6ce2c440"
version: "v2.0.11"
- name: build conmon
make:
......
......@@ -16,7 +16,7 @@ require (
github.com/containernetworking/cni v0.7.2-0.20190904153231-83439463f784
github.com/containernetworking/plugins v0.8.2
github.com/containers/buildah v1.11.5-0.20191031204705-20e92ffe0982
github.com/containers/conmon v2.0.2+incompatible
github.com/containers/conmon v2.0.11+incompatible
github.com/containers/image/v5 v5.0.1-0.20200205124631-82291c45f2b0
github.com/containers/libpod v1.6.3-0.20191111140219-de32b89eff09
github.com/containers/storage v1.13.6
......
......@@ -6,4 +6,14 @@ const (
// ConnSockBufSize is the size of the socket used for
// to attach to the container
ConnSockBufSize = 32768
// WinResizeEvent is the event code the caller program will
// send along the ctrl fd to signal conmon to resize
// the pty window
WinResizeEvent = 1
// ReopenLogsEvent is the event code the caller program will
// send along the ctrl fd to signal conmon to reopen the log files
ReopenLogsEvent = 2
// TimedOutMessage is the message sent back to the caller by conmon
// when a container times out
TimedOutMessage = "command timed out"
)
......@@ -95,7 +95,7 @@ github.com/containers/buildah/pkg/cgroups
github.com/containers/buildah/pkg/chrootuser
github.com/containers/buildah/pkg/overlay
github.com/containers/buildah/pkg/cli
# github.com/containers/conmon v2.0.2+incompatible
# github.com/containers/conmon v2.0.11+incompatible
github.com/containers/conmon/runner/config
# github.com/containers/image/v5 v5.0.1-0.20200205124631-82291c45f2b0
github.com/containers/image/v5/pkg/sysregistriesv2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment