docker/ci: cross-compiler - use static

As we can't cross compile a dynamic skydive executable for now
we're limited to a static executable for cross-architecture.

ref: https://bugs.launchpad.net/ubuntu/+source/glib2.0/+bug/1784779
and https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/1784772

This static executable doesn't require the qemu trick to run a
non-native apt-get to build a dynamic docker environment so we've
reverted that change for now for now.

Author: grooverdan

.gitignore

@@ -14,7 +14,6 @@ contrib/vagrant/.vagrant/
 contrib/dev/.vagrant/
 contrib/snort/snortSkydive
 contrib/docker/skydive.*
-contrib/docker/qemu-*-static
 skydive.yml
 probe/ebpf/flow.o
 js/api.js

Makefile

@@ -480,7 +480,6 @@ rpm:
 .PHONY: docker-image
 docker-image: static
 	cp $$GOPATH/bin/skydive contrib/docker/skydive.$$(uname -m)
-	touch contrib/docker/qemu-$$(uname -m)-static
 	docker build -t ${DOCKER_IMAGE}:${DOCKER_TAG} --build-arg ARCH=$$(uname -m) -f contrib/docker/Dockerfile contrib/docker/
 
 .PHONY: docker-build
@@ -497,7 +496,6 @@ docker-build:
 		skydive-compile
 	docker cp skydive-compile-build:/root/go/bin/skydive contrib/docker/skydive.$$(uname -m)
 	docker rm skydive-compile-build
-	touch contrib/docker/qemu-$$(uname -m)-static
 	docker build -t ${DOCKER_IMAGE}:${DOCKER_TAG} \
 		--build-arg ARCH=$$(uname -m) \
 		-f contrib/docker/Dockerfile contrib/docker/
@@ -519,11 +517,10 @@ docker-cross-build: ebpf.build
 		skydive-crosscompile-${TARGET_GOARCH}
 	docker cp skydive-crosscompile-build-${TARGET_GOARCH}:/root/go/bin/linux_${TARGET_GOARCH}/skydive contrib/docker/skydive.${TARGET_GOARCH}
 	docker rm skydive-crosscompile-build-${TARGET_GOARCH}
-	cp /usr/bin/qemu-${TARGET_GOARCH}-static contrib/docker || cp /bin/true contrib/docker/qemu-${TARGET_GOARCH}-static
 	docker build -t ${DOCKER_IMAGE}:${DOCKER_TAG} \
 		--build-arg ARCH=${TARGET_GOARCH} \
 		$${BASE:+--build-arg BASE=$${BASE}} \
-		-f contrib/docker/Dockerfile contrib/docker/
+		-f contrib/docker/Dockerfile.static contrib/docker/
 
 SKYDIVE_PROTO_FILES:= \
 	flow/flow.proto \

contrib/docker/Dockerfile

@@ -1,7 +1,6 @@
 ARG  BASE=ubuntu:18.04
 FROM $BASE
 ARG  ARCH=x86_64
-COPY qemu-$ARCH-static /usr/bin
 RUN apt-get -y update \
     && apt-get -y install openvswitch-common libpcap0.8 libxml2 \
     && rm -rf /var/lib/apt/lists/*

contrib/docker/Dockerfile.static

@@ -0,0 +1,6 @@
+ARG  BASE=ubuntu:18.04
+FROM $BASE
+ARG  ARCH=x86_64
+COPY skydive.$ARCH /usr/bin/skydive
+COPY skydive.yml /etc/skydive.yml
+ENTRYPOINT ["/usr/bin/skydive", "--conf", "/etc/skydive.yml"]