Merge pull request #59 from Hansyangxingxiang/master

1. Package qbd to the csi-neonsan image; 2. The csi-neonsan image does not distinguish between OS versions; 3. Support both ARM and X86

Makefile

@@ -17,24 +17,14 @@
 .PHONY: all disk
 
 IMAGE=csiplugin/csi-neonsan
-TAG=canary
-UBUNTU_VERSION=1604
-IMAGE_UBUNTU=csiplugin/csi-neonsan-ubuntu${UBUNTU_VERSION}
-TAG_UBUNTU=canary
-IMAGE_CENTOS=csiplugin/csi-neonsan-centos
-TAG_CENTOS=canary
+TAG=v2.3.0
 ROOT_PATH=$(pwd)
+ARCH=$(shell arch)
 PACKAGE_LIST=./cmd/... ./pkg/...
 
 container:
-	docker build -t ${IMAGE}:${TAG} -f deploy/neonsan/docker/Dockerfile  .
-
-container-ubuntu:
-	docker build -t ${IMAGE_UBUNTU}:${TAG_UBUNTU} -f deploy/neonsan/docker/ubuntu/${UBUNTU_VERSION}.Dockerfile  .
-
-container-centos:
-	docker build -t ${IMAGE_CENTOS}:${TAG_CENTOS} -f deploy/neonsan/docker/centos/Dockerfile  .
-
+	docker build -t ${IMAGE}:${TAG} -f deploy/neonsan/docker/${ARCH}/Dockerfile  .
+
 mod:
 	go build ./...
 	go mod download

deploy/neonsan/docker/ubuntu/1804.Dockerfile → deploy/neonsan/docker/aarch64/Dockerfile

@@ -18,6 +18,8 @@ FROM golang:1.14.4-alpine as builder
 WORKDIR /qingstor-csi
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=vendor  -ldflags "-s -w" -o  _output/neonsan-csi-driver ./cmd/neonsan
+COPY deploy/neonsan/qbd/aarch64/pitrix-dep-qbd-util-*.deb  _output/
+
 
 FROM ubuntu:18.04
 LABEL maintainers="Yunify"
@@ -27,6 +29,8 @@ RUN apt-get update -y && \
     apt-get install -y libcurl4 libicu60 && \
     apt-get install -y e2fsprogs xfsprogs mount ca-certificates udev
 COPY --from=builder /qingstor-csi/_output/neonsan-csi-driver /neonsan-csi-driver
+COPY --from=builder /qingstor-csi/_output/pitrix-dep-qbd-util-*.deb /root/
+RUN dpkg -i /root/pitrix-dep-qbd-util-*.deb && rm -rf  /root/pitrix-dep-qbd-util-*.deb
 RUN chmod +x /neonsan-csi-driver && \
     mkdir -p /var/log/neonsan-csi-driver
 ENTRYPOINT ["/neonsan-csi-driver"]

deploy/neonsan/docker/ubuntu/Dockerfile → deploy/neonsan/docker/x86_64/Dockerfile

@@ -18,6 +18,7 @@ FROM golang:1.14.4-alpine as builder
 WORKDIR /qingstor-csi
 COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -a -mod=vendor  -ldflags "-s -w" -o  _output/neonsan-csi-driver ./cmd/neonsan
+COPY deploy/neonsan/qbd/x86_64/pitrix-dep-qbd-util-*.deb  _output/
 
 FROM ubuntu:16.04
 LABEL maintainers="Yunify"
@@ -27,6 +28,8 @@ RUN apt-get update -y && \
     apt-get install -y libcurl3 libicu55 && \
     apt-get install -y e2fsprogs xfsprogs mount ca-certificates udev
 COPY --from=builder /qingstor-csi/_output/neonsan-csi-driver /neonsan-csi-driver
+COPY --from=builder /qingstor-csi/_output/pitrix-dep-qbd-util-*.deb /root/
+RUN dpkg -i /root/pitrix-dep-qbd-util-*.deb && rm -rf  /root/pitrix-dep-qbd-util-*.deb
 RUN chmod +x /neonsan-csi-driver && \
     mkdir -p /var/log/neonsan-csi-driver
 ENTRYPOINT ["/neonsan-csi-driver"]