Merge branch 'V5.4' into pr/path-rewrite

.drone.yml

@@ -0,0 +1,48 @@
+kind: pipeline
+name: build arm64
+
+platform:
+  os: linux
+  arch: arm64
+
+trigger:
+  event:
+    include:
+    - custom
+
+steps:
+- name: build rainbond
+  image: rainbond/docker:dind
+  privileged: true
+  volumes:
+  - name: dockersock
+    path: /var/run
+  environment:
+    DOMESTIC_BASE_NAME:
+      from_secret: domestic_base_name
+    DOMESTIC_DOCKER_USERNAME:
+      from_secret: domestic_docker_username
+    DOMESTIC_DOCKER_PASSWORD:
+      from_secret: domestic_docker_password
+    BUILD_VERSION:
+      from_secret: build_version
+    GOOS: linux
+    GOARCH: arm64
+  commands:
+  - sleep 10 # give docker enough time to start
+  - VERSION=$BUILD_VERSION BUILD_GOARCH=arm64 BUILD_BASE_IMAGE_VERSION=3.7 ./release.sh all push
+  when:
+    event:
+      include:
+      - custom
+services:
+- name: docker
+  image: docker:dind
+  privileged: true
+  volumes:
+  - name: dockersock
+    path: /var/run
+
+volumes:
+- name: dockersock
+  temp: {}

release.sh

@@ -116,8 +116,9 @@ build::image() {
 	if [ "$2" = "push" ]; then
 		if [ $DOCKER_USERNAME ]; then
 			docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+			docker push "${IMAGE_BASE_NAME}/rbd-$1:${VERSION}"
 		fi
-		docker push "${IMAGE_BASE_NAME}/rbd-$1:${VERSION}"
+		
 		if [ "${DOMESTIC_BASE_NAME}" ]; then
 			docker tag "${IMAGE_BASE_NAME}/rbd-$1:${VERSION}" "${DOMESTIC_BASE_NAME}/${DOMESTIC_NAMESPACE}/rbd-$1:${VERSION}"
 			docker login -u "$DOMESTIC_DOCKER_USERNAME" -p "$DOMESTIC_DOCKER_PASSWORD" "${DOMESTIC_BASE_NAME}"