From 4b4bd128ce91546e926f9983988fb75c00ac30da Mon Sep 17 00:00:00 2001 From: nipsufn Date: Wed, 6 Nov 2019 20:42:54 +0100 Subject: [PATCH 1/4] Fix https://github.com/bettercap/bettercap/issues/644 as described in https://github.com/golang/dep/issues/2055#issuecomment-456782205 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a1696565..103ffd4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apk add --no-cache --update bash iptables wireless-tools build-base libpcap- WORKDIR $SRC_DIR ADD . $SRC_DIR -RUN go get -u github.com/golang/dep/... +RUN GO111MODULE=off go get -u github.com/golang/dep/... RUN make deps RUN make From cc9baaca1b61402c34c018197232508e4adcbe79 Mon Sep 17 00:00:00 2001 From: nipsufn Date: Wed, 6 Nov 2019 21:02:49 +0100 Subject: [PATCH 2/4] Adjust Dockerfile for changes introduced in e06b832911a79b82b678cc31e467b0fdf970636e --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 103ffd4b..03b4594b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ RUN apk add --no-cache --update bash iptables wireless-tools build-base libpcap- WORKDIR $SRC_DIR ADD . $SRC_DIR RUN GO111MODULE=off go get -u github.com/golang/dep/... -RUN make deps RUN make # get caplets From d42621aa5905f60489b773e6ec386be211bdf7c4 Mon Sep 17 00:00:00 2001 From: nipsufn Date: Wed, 6 Nov 2019 21:33:28 +0100 Subject: [PATCH 3/4] Dockerfile: fix caplets --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 03b4594b..bdfdd6e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM alpine RUN apk add --update ca-certificates RUN apk add --no-cache --update bash iproute2 libpcap libusb-dev libnetfilter_queue wireless-tools COPY --from=build-env /go/src/github.com/bettercap/bettercap/bettercap /app/ -COPY --from=build-env /go/src/github.com/bettercap/bettercap/caplets /app/ +COPY --from=build-env /usr/local/share/bettercap/caplets /app/ WORKDIR /app EXPOSE 80 443 53 5300 8080 8081 8082 8083 8000 From a642a19b5f68befeb54ed9b2eee329b02a3ffcd2 Mon Sep 17 00:00:00 2001 From: nipsufn Date: Wed, 6 Nov 2019 22:02:45 +0100 Subject: [PATCH 4/4] Dockerfile: Use go modules instead of third party dependency tool (fe7e103387db098dc23dd98ba41b85d3e5c9bcb5) --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bdfdd6e8..e65d47ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ RUN apk add --no-cache --update bash iptables wireless-tools build-base libpcap- WORKDIR $SRC_DIR ADD . $SRC_DIR -RUN GO111MODULE=off go get -u github.com/golang/dep/... RUN make # get caplets