From 637bdf66b1fec27e99e1a222782c5711c8a5429d Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Fri, 26 Oct 2018 09:54:57 +0300 Subject: [PATCH 1/2] Change golint import path See https://github.com/golang/lint/issues/415 --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 67e9c339..3b54fff6 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -50,7 +50,7 @@ RUN curl -fsSLo shfmt https://github.com/mvdan/sh/releases/download/v1.3.0/shfmt # Install common Go tools RUN go get \ - github.com/golang/lint/golint \ + golang.org/x/lint/golint \ github.com/fzipp/gocyclo \ github.com/fatih/hclfmt \ github.com/client9/misspell/cmd/misspell From c3aa03229cb746cd99cd1cf7ecb7620354bfbce3 Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Fri, 26 Oct 2018 10:07:50 +0300 Subject: [PATCH 2/2] Use https for downloading libpcap --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 3b54fff6..ab1f5e08 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -74,7 +74,7 @@ RUN chmod -R a+w /usr/local/go # The libpcap version from Debian packages is 1.6.2, matching that version here although newer versions of libpcap have been released # We have to cross-compile the libpcap library for the new architectures, that's what we're doing here ENV LIBPCAP_CROSS_VERSION=1.6.2 -RUN curl -sSL http://www.tcpdump.org/release/libpcap-${LIBPCAP_CROSS_VERSION}.tar.gz | tar -xz \ +RUN curl -sSL https://www.tcpdump.org/release/libpcap-${LIBPCAP_CROSS_VERSION}.tar.gz | tar -xz \ && cd libpcap-${LIBPCAP_CROSS_VERSION} \ && for crosscompiler in ${GCC_CROSSCOMPILERS}; do \ CC=${crosscompiler}-gcc ac_cv_linux_vers=2 ./configure --host=${crosscompiler} --with-pcap=linux \