From 9cf3c3b20f56691a3e3d3f9cd6a10630754ac458 Mon Sep 17 00:00:00 2001 From: Juan Calderon-Perez <835733+gaby@users.noreply.github.com> Date: Thu, 11 Mar 2021 01:05:55 -0500 Subject: [PATCH 1/5] Update alpine base image to 3.11.8 Update alpine 3.11 to latest patch version. --- docker/Dockerfile.cloud-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index 111ef5369d..f06bd9949d 100644 --- a/docker/Dockerfile.cloud-agent +++ b/docker/Dockerfile.cloud-agent @@ -1,4 +1,4 @@ -FROM alpine:3.11.3 +FROM alpine:3.11.8 WORKDIR /home/weave RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl COPY ./scope /home/weave/ From a6091337e6b5ab07183437893bd0af67613daec8 Mon Sep 17 00:00:00 2001 From: Juan Calderon-Perez <835733+gaby@users.noreply.github.com> Date: Thu, 11 Mar 2021 07:41:17 -0500 Subject: [PATCH 2/5] Bump alpine to 3.13 --- docker/Dockerfile.cloud-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index f06bd9949d..b99fb87c88 100644 --- a/docker/Dockerfile.cloud-agent +++ b/docker/Dockerfile.cloud-agent @@ -1,4 +1,4 @@ -FROM alpine:3.11.8 +FROM alpine:3.13 WORKDIR /home/weave RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl COPY ./scope /home/weave/ From 321567da7117901ae01478088a9ca493049bca7f Mon Sep 17 00:00:00 2001 From: Juan Calderon-Perez <835733+gaby@users.noreply.github.com> Date: Thu, 11 Mar 2021 08:49:16 -0500 Subject: [PATCH 3/5] Add libpcap-dev to Dockerfile --- docker/Dockerfile.cloud-agent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index b99fb87c88..b5038c551f 100644 --- a/docker/Dockerfile.cloud-agent +++ b/docker/Dockerfile.cloud-agent @@ -1,6 +1,6 @@ -FROM alpine:3.13 +FROM alpine:3.13.2 WORKDIR /home/weave -RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl +RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl libpcap-dev COPY ./scope /home/weave/ ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"] From 8e63fec569eda7696c069950ab8451675b854f14 Mon Sep 17 00:00:00 2001 From: Juan Calderon-Perez <835733+gaby@users.noreply.github.com> Date: Sun, 14 Mar 2021 00:07:39 -0500 Subject: [PATCH 4/5] Update Dockerfile.cloud-agent Add bbc-tools as indicated on gobpf github. --- docker/Dockerfile.cloud-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index b5038c551f..71769e150c 100644 --- a/docker/Dockerfile.cloud-agent +++ b/docker/Dockerfile.cloud-agent @@ -1,6 +1,6 @@ FROM alpine:3.13.2 WORKDIR /home/weave -RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl libpcap-dev +RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl bcc-tools libpcap-dev COPY ./scope /home/weave/ ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"] From 50a9cd0f8ecad1f2170440c826c70d709cc83f3c Mon Sep 17 00:00:00 2001 From: Juan Calderon-Perez <835733+gaby@users.noreply.github.com> Date: Wed, 17 Mar 2021 09:03:31 -0400 Subject: [PATCH 5/5] Remove dev dependencies --- docker/Dockerfile.cloud-agent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index 71769e150c..04d87274e1 100644 --- a/docker/Dockerfile.cloud-agent +++ b/docker/Dockerfile.cloud-agent @@ -1,6 +1,6 @@ FROM alpine:3.13.2 WORKDIR /home/weave -RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl bcc-tools libpcap-dev +RUN apk add --no-cache bash conntrack-tools iproute2 util-linux curl COPY ./scope /home/weave/ ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"]