summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile16
1 files changed, 1 insertions, 15 deletions
diff --git a/Dockerfile b/Dockerfile
index 4fc85e959..214fbeb34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ RUN set -x \
&& rm -rf "$GOPATH"
# 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" \
@@ -79,14 +79,6 @@ RUN set -x \
&& cp bin/* /usr/libexec/cni \
&& rm -rf "$GOPATH"
-# Install buildah
-RUN set -x \
- && export GOPATH=/go \
- && git clone https://github.com/containers/buildah "$GOPATH/src/github.com/containers/buildah" \
- && cd "$GOPATH/src/github.com/containers/buildah" \
- && make \
- && make install
-
# Install ginkgo
RUN set -x \
&& export GOPATH=/go \
@@ -98,12 +90,6 @@ RUN set -x \
&& export GOPATH=/go \
&& go get github.com/onsi/gomega/...
-# Install easyjson
-RUN set -x \
- && export GOPATH=/go \
- && go get -u github.com/mailru/easyjson/... \
- && install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/
-
# Install latest stable criu version
RUN set -x \
&& cd /tmp \