Merge pull request #108 from eolinker/release/v0.12.7

修改docker打包脚本
eolinker · May 15, 2023 · f026ac7 · f026ac7
2 parents cdf0182 + 508cefc
commit f026ac7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 92 deletions.
diff --git a/.gitlab-ci.yml~gitlab_feature_fix-cert b/.gitlab-ci.yml~gitlab_feature_fix-cert
diff --git a/build/cmd/Dockerfile b/build/cmd/Dockerfile
@@ -3,6 +3,8 @@
 FROM centos:7.9.2009
 MAINTAINER eolink
 
+RUN yum install -y wget && wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&  rpm -ivh epel-release-latest-7.noarch.rpm && yum install -y jq
+
 #声明端口
 EXPOSE 9400 8099
 

diff --git a/build/resources/Dockerfile b/build/resources/Dockerfile
@@ -3,6 +3,7 @@
 FROM centos:7.9.2009
 MAINTAINER eolink
 
+RUN yum install -y wget && wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm &&  rpm -ivh epel-release-latest-7.noarch.rpm && yum install -y jq
 #声明端口
 EXPOSE 9400 8099
 

diff --git a/build/resources/join.sh b/build/resources/join.sh
@@ -4,7 +4,7 @@ set -e
 sleep 5s
 
 #Gets the IP addresses of all pods under the target service
-response=$(curl -s GET "https://kubernetes.default.svc:443/api/v1/namespaces/${SVC_NAMESPACE}/endpoints/${SVC_NAME}" -k -H "Authorization: ${SVC_TOKEN}")
+response=$(curl -s "https://kubernetes.default.svc:443/api/v1/namespaces/${SVC_NAMESPACE}/endpoints/${SVC_NAME}" -k -H "Authorization: Bearer ${SVC_TOKEN}")
 
 #Determines whether the request was successful
 if [[ ${response} =~ 'Failure' ]]