Переглянути джерело

chore: fix zmq install script (#1798)

* fix zmq install.sh

Signed-off-by: Rui-Gan <1171530954@qq.com>

* fix zmq install.sh

Signed-off-by: Rui-Gan <1171530954@qq.com>

* fix build_packages

Signed-off-by: Rui-Gan <1171530954@qq.com>

---------

Signed-off-by: Rui-Gan <1171530954@qq.com>
Regina 2 роки тому
батько
коміт
6247a46e9e

+ 1 - 4
.github/workflows/build_packages.yaml

@@ -247,7 +247,7 @@ jobs:
         plugin_type=$(echo ${PLUGIN%%/*})
         plugin_type=$(echo ${PLUGIN%%/*})
         plugin_name=$(echo ${PLUGIN##*/})
         plugin_name=$(echo ${PLUGIN##*/})
 
 
-        container_id=$(docker run -d -v $(pwd)/_plugins:/var/plugins docker.io/lfedge/ekuiper-${{ matrix.os[0] }})
+        container_id=$(docker run -u 0 -d -v $(pwd)/_plugins:/var/plugins docker.io/lfedge/ekuiper-${{ matrix.os[0] }})
         ip_address=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $container_id)
         ip_address=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $container_id)
         os=$(docker exec -i ${container_id} sh -c "sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g'" )
         os=$(docker exec -i ${container_id} sh -c "sed -n '/^ID=/p' /etc/os-release | sed -r 's/ID=(.*)/\1/g'" )
         sleep 5
         sleep 5
@@ -273,9 +273,6 @@ jobs:
             -X POST \
             -X POST \
             -d "{\"name\":\"${plugin_name}\", \"file\":\"file:///var/plugins/${os}/${plugin_type}/${plugin_name}_amd64.zip\"}"
             -d "{\"name\":\"${plugin_name}\", \"file\":\"file:///var/plugins/${os}/${plugin_type}/${plugin_name}_amd64.zip\"}"
         fi
         fi
-        if [ "${plugin_name}" = "zmq" ]; then
-           exit 0
-        fi
         docker logs ${container_id}
         docker logs ${container_id}
         [ $plugin_name = $(curl ${ip_address}:9081/plugins/${plugin_type}/${plugin_name} | jq '.name'| sed 's/\"//g' ) ] || exit 1
         [ $plugin_name = $(curl ${ip_address}:9081/plugins/${plugin_type}/${plugin_name} | jq '.name'| sed 's/\"//g' ) ] || exit 1
     - uses: actions/upload-artifact@v3
     - uses: actions/upload-artifact@v3

+ 6 - 5
extensions/sinks/zmq/install.sh

@@ -48,9 +48,10 @@ Get_Dist_Name
 
 
 case $DISTRO in \
 case $DISTRO in \
     Debian|Ubuntu|Raspbian ) \
     Debian|Ubuntu|Raspbian ) \
-	apt update \
-	&& apt upgrade \
-        && apt install -y libzmq3-dev 2> /dev/null \
+	      apt-get update \
+          && apt-get install -y libczmq-dev 2> /dev/null \
+          && apt-get clean \
+          && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     ;; \
     ;; \
     Alpine ) \
     Alpine ) \
         apk add libzmq \
         apk add libzmq \
@@ -59,5 +60,5 @@ case $DISTRO in \
         yum install -y zeromq 2> /dev/null \
         yum install -y zeromq 2> /dev/null \
     ;; \
     ;; \
 esac
 esac
-    
-echo "install success";
+
+echo "install success";

+ 6 - 5
extensions/sources/zmq/install.sh

@@ -48,9 +48,10 @@ Get_Dist_Name
 
 
 case $DISTRO in \
 case $DISTRO in \
     Debian|Ubuntu|Raspbian ) \
     Debian|Ubuntu|Raspbian ) \
-	apt update \
-	&& apt upgrade \
-        && apt install -y libzmq3-dev 2> /dev/null \
+	      apt-get update \
+          && apt-get install -y libczmq-dev 2> /dev/null \
+          && apt-get clean \
+          && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     ;; \
     ;; \
     Alpine ) \
     Alpine ) \
         apk add libzmq \
         apk add libzmq \
@@ -59,5 +60,5 @@ case $DISTRO in \
         yum install -y zeromq 2> /dev/null \
         yum install -y zeromq 2> /dev/null \
     ;; \
     ;; \
 esac
 esac
-    
-echo "install success";
+
+echo "install success";