dapr

all.list

@@ -16,7 +16,6 @@ https://github.com/etcd-io/website.git
 https://github.com/coredns/coredns.io.git
 https://github.com/jaegertracing/documentation.git
 https://github.com/grpc/grpc.io.git
-https://github.com/dapr/docs.git
 https://github.com/emissary-ingress/emissary-ingress.dev.git
 https://github.com/crossplane/docs.git
 https://github.com/kedacore/keda-docs.git
@@ -38,3 +37,4 @@ https://github.com/knative/docs.git
 https://github.com/loggie-io/docs.git
 https://github.com/containernetworking/cni.dev.git
 https://github.com/containerd/containerd.io.git
+https://github.com/dapr/docs.git

push.list

@@ -1 +1 @@
-https://github.com/containerd/containerd.io.git
+https://github.com/dapr/docs.git

webs/cni/toto.sh

@@ -22,7 +22,7 @@ after_cni_website(){
     --minify \
     --gc \
     --enableGitInfo \
-    --baseURL https://cni.cncfstack.com
+    --baseURL https://cni.website.cncfstack.com
 
 }
 
@@ -34,7 +34,7 @@ save_return(){
     tarfile="cni.tgz"
 
     # 进入到site目录后进行打包，这样是为了便于部署时解压
-    tar -czvf ${tarfile} -C output .
+    tar -czf ${tarfile} -C output .
 
     if [ ! -s ${tarfile} ];then
         log_error "Loggie 站点构建失败"

webs/containerd/toto.sh

@@ -25,7 +25,7 @@ after_containerd_website(){
     --minify \
     --gc \
     --enableGitInfo \
-    --baseURL https://containerd.cncfstack.com
+    --baseURL https://containerd.website.cncfstack.com
 
 }
 
@@ -37,7 +37,7 @@ save_return(){
     tarfile="containerd.tgz"
 
     # 进入到site目录后进行打包，这样是为了便于部署时解压
-    tar -czvf ${tarfile} -C output .
+    tar -czf ${tarfile} -C output .
 
     if [ ! -s ${tarfile} ];then
         log_error "Loggie 站点构建失败"

webs/dapr/toto.sh

@@ -1,13 +1,11 @@
 workdir=$1
-initdir=$2
 
 source libs/common.sh
 
-before_dapr_website(){
+before_build(){
     install_hugo_v102_3
     #install_postcss
 
-
     cd daprdocs
     git submodule update --init --recursive
     sudo npm install -D --save autoprefixer
@@ -28,21 +26,32 @@ after_dapr_website(){
     --minify \
     --gc \
     --enableGitInfo \
-    --baseURL https://dapr.cncfstack.com
+    --baseURL https://dapr.website.cncfstack.com
 
 }
 
 save_return(){
     ls -lha
     pwd
-    echo "${workdir}/daprdocs/output&oss://cncfstack-dapr" > ${workdir}/ret-data
+    #echo "${workdir}/daprdocs/output&oss://cncfstack-dapr" > ${workdir}/ret-data
+    # 这行很重要，在其他关联项目中，文件名称必须要匹配
+    tarfile="dapr.tgz"
+
+    # 进入到site目录后进行打包，这样是为了便于部署时解压
+    tar -czf ${tarfile} -C daprdocs/output .
+
+    if [ ! -s ${tarfile} ];then
+        log_error "Loggie 站点构建失败"
+    fi
+
+    echo "${workdir}/${tarfile}" > ${workdir}/ret-data
 }
 
 
 cd $workdir
 if cat .git/config  |grep '/dapr/docs.git' ;then
     echo "=============================================> 匹配到 dapr"
-    before_dapr_website
+    before_build
     after_dapr_website
     find_and_sed_v2 "./output"
     save_return 

webs/loggie/toto.sh

@@ -28,7 +28,7 @@ save_return(){
     tarfile="loggie.tgz"
 
     # 进入到site目录后进行打包，这样是为了便于部署时解压
-    tar -czvf ${tarfile} -C site .
+    tar -czf ${tarfile} -C site .
 
     if [ ! -s ${tarfile} ];then
         log_error "Loggie 站点构建失败"
@@ -39,8 +39,6 @@ save_return(){
 
 
 
-
-
 cd $workdir
 if cat .git/config  |grep '/loggie-io/docs.git' ;then
     echo "=============================================> 匹配到 loggie"