Merge pull request #655 from lebauce/bump-go-doc

rpm: add build dependencies for eBPF

Author: safchain

.travis.yml

@@ -35,8 +35,8 @@ script:
     - export BUILD_TAG=$(date +%Y-%m-%d).${TRAVIS_JOB_NUMBER}
     - export PATH=${GOPATH}/bin:${PATH}
 
-    - make WITH_DPDK=true WITH_EBPF=true install
-    - make static
+    - make WITH_EBPF=true install
+    - make WITH_EBPF=true static
 
     - echo "--- DOCKER IMAGE ---"
     - make docker-image DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_TAG=${BUILD_TAG}

Makefile

@@ -66,7 +66,7 @@ install: govendor genlocalfiles dpdk.build contribs .compile
 build: govendor genlocalfiles dpdk.build contribs
 	${GOPATH}/bin/govendor build -ldflags="-X github.com/skydive-project/skydive/version.Version=${VERSION}" ${GOFLAGS} -tags="${BUILDTAGS} ${GOTAGS}" ${VERBOSE_FLAGS} +local
 
-static: #govendor genlocalfiles
+static: govendor genlocalfiles
 	rm -f $$GOPATH/bin/skydive
 	test -f /etc/redhat-release && govendor install -tags netgo --ldflags '-extldflags "-static /usr/lib64/libz.a /usr/lib64/liblzma.a /usr/lib64/libm.a"' ${VERBOSE_FLAGS} -tags "${BUILDTAGS} ${GOTAGS}" +local || true
 	test -f /etc/debian_version && govendor install -tags netgo --ldflags '-extldflags "-static /usr/lib/x86_64-linux-gnu/libz.a /usr/lib/x86_64-linux-gnu/liblzma.a /usr/lib/x86_64-linux-gnu/libicuuc.a /usr/lib/x86_64-linux-gnu/libicudata.a /usr/lib/x86_64-linux-gnu/libxml2.a /usr/lib/x86_64-linux-gnu/libc.a /usr/lib/x86_64-linux-gnu/libdl.a /usr/lib/x86_64-linux-gnu/libpthread.a /usr/lib/x86_64-linux-gnu/libc++.a /usr/lib/x86_64-linux-gnu/libm.a"' ${VERBOSE_FLAGS} -tags "${BUILDTAGS} ${GOTAGS}" +local || true
@@ -208,6 +208,8 @@ dist:
 	mkdir -p `dirname $$skydivedir`; \
 	git clone . $$skydivedir; \
 	pushd $$skydivedir; \
+	mkdir -p $$godir/.cache; \
+	[ -d $$GOPATH/.cache/govendor ] && ln -s $$GOPATH/.cache/govendor $$godir/.cache/govendor; \
 	export GOPATH=$$godir; \
 	cd $$skydivedir; \
 	echo "go take a coffee, govendor sync takes time ..."; \

contrib/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM scratch
+FROM gcr.io/distroless/base
 COPY skydive /usr/bin/skydive
 COPY skydive.yml /etc/skydive.yml
 ENTRYPOINT ["/usr/bin/skydive", "--conf", "/etc/skydive.yml"]

contrib/packaging/rpm/skydive.spec

@@ -32,6 +32,7 @@ URL:            https://%{import_path}
 Source0:        https://%{import_path}/releases/download/v%{source}/skydive-%{source}.tar.gz
 BuildRequires:  systemd
 BuildRequires:  libpcap-devel libxml2-devel
+BuildRequires:  llvm clang kernel-headers
 
 # This is used by the specfile-update-bundles script to automatically
 # generate the list of the Go libraries bundled into the Skydive binaries

doc/content/getting-started/install.md

@@ -13,7 +13,7 @@ Skydive relies on two main components:
 
 ## Dependencies
 
-* Go >= 1.6
+* Go >= 1.8
 * Elasticsearch >= 2.0
 * libpcap
 * libxml2

scripts/ci/create-release.sh

@@ -33,7 +33,7 @@ dir="$(dirname "$0")"
 cd ${GOPATH}/src/github.com/skydive-project/skydive
 
 echo "--- DOCKER IMAGE ---"
-make docker-image DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_TAG=${DOCKER_TAG}
+make docker-image WITH_EBPF=true DOCKER_IMAGE=${DOCKER_IMAGE} DOCKER_TAG=${DOCKER_TAG}
 sudo docker login -e "${DOCKER_EMAIL}" -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}"
 sudo docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest
 sudo docker push ${DOCKER_IMAGE}:${DOCKER_TAG}