[release-1.1]chore(arm64): support building arm64 images (#80)

* update vendor

* support building arm64 images

Gopkg.toml

@@ -9,7 +9,7 @@
 
 [[constraint]]
   name = "github.com/elastic/beats"
-  version = "6.5.4"
+  version = "7.6.0"
 
 [[constraint]]
   name = "github.com/elastic/go-ucfg"

Makefile

@@ -38,12 +38,21 @@ TARGETS ?= log-pilot filebeat-keeper
 IMAGE_PREFIX ?= $(strip )
 IMAGE_SUFFIX ?= $(strip )
 
-# Container registries.
-REGISTRY ?= cargo.dev.caicloud.xyz/release
-
 # Container registry for base images.
 BASE_REGISTRY ?= cargo.caicloud.xyz/library
 
+# Go build GOARCH, you can choose to build amd64 or arm64
+ARCH ?= amd64
+
+# Change Dockerfile name and registry project name for arm64
+ifeq ($(ARCH),arm64)
+DOCKERFILE := Dockerfile.arm64
+REGISTRY ?= cargo.dev.caicloud.xyz/arm64v8
+else
+DOCKERFILE := Dockerfile
+REGISTRY ?= cargo.dev.caicloud.xyz/release
+endif
+
 #
 # These variables should not need tweaking.
 #
@@ -111,7 +120,7 @@ build-linux:
 	  -v $(PWD):/go/src/$(ROOT)                                                        \
 	  -w /go/src/$(ROOT)                                                               \
 	  -e GOOS=linux                                                                    \
-	  -e GOARCH=amd64                                                                  \
+	  -e GOARCH=$(ARCH)                                                                \
 	  -e GOPATH=/go                                                                    \
 	  -e SHELLOPTS=$(SHELLOPTS)                                                        \
 	  $(BASE_REGISTRY)/golang:1.10.4-stretch                                           \
@@ -128,7 +137,7 @@ container: build-linux
 	  image=$(IMAGE_PREFIX)$${target}$(IMAGE_SUFFIX);                                  \
 	  docker build -t $(REGISTRY)/$${image}:$(VERSION)                                 \
 	    --label $(DOCKER_LABELS)                                                       \
-	    -f $(BUILD_DIR)/$${target}/Dockerfile .;                                       \
+	    -f $(BUILD_DIR)/$${target}/$(DOCKERFILE)  .;                                   \
 	done
 
 push: container

build/filebeat-keeper/Dockerfile.arm64

@@ -0,0 +1,10 @@
+FROM cargo.dev.caicloud.xyz/arm64v8/filebeat:6.8.6
+
+USER root
+RUN mkdir /etc/filebeat
+COPY build/filebeat-keeper/k8s-log-template.json /etc/filebeat/k8s-log-template.json
+COPY build/filebeat-keeper/filebeat.yml.tpl /etc/filebeat/filebeat.yml.tpl
+COPY bin/filebeat-keeper /opt/filebeat-keeper/filebeat-keeper
+
+WORKDIR /usr/share/filebeat
+CMD ["/opt/filebeat-keeper/filebeat-keeper"]

build/filebeat/Dockerfile.arm64

@@ -0,0 +1,10 @@
+FROM cargo.dev.caicloud.xyz/arm64v8/filebeat:6.8.6
+
+USER root
+RUN mkdir /etc/filebeat
+COPY build/filebeat/k8s-log-template.json /etc/filebeat/k8s-log-template.json
+COPY build/filebeat/filebeat.yml.tpl /etc/filebeat/filebeat.yml.tpl
+COPY bin/filebeat-keeper /opt/filebeat-keeper/filebeat-keeper
+
+WORKDIR /usr/share/filebeat
+CMD ["/opt/filebeat-keeper/filebeat-keeper"]

build/log-pilot/Dockerfile.arm64

@@ -0,0 +1,7 @@
+FROM cargo.caicloud.xyz/arm64v8/debian:stretch-curl
+
+COPY bin/log-pilot /opt/log-pilot/bin/log-pilot
+COPY assets/filebeat/filebeat.tpl /opt/log-pilot
+
+WORKDIR /opt/log-pilot
+CMD ["/opt/log-pilot/bin/log-pilot"]