配置公有云镜像库

L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile

@@ -3,14 +3,13 @@ FROM csu-harbor.csst.nao:10443/csst/csst-msc-l1-sls
 USER root
 COPY run.sh /app/bin/
 RUN chmod +x /app/bin/run.sh
-COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin /usr/local/sbin
+COPY --from=hub.cstcloud.cn/scalebox/agent /usr/local /usr/local
 
-RUN mkdir /work/
+RUN mkdir /work/ 
 RUN chown -R csst:csst /work
 RUN chown -R csst:csst /pipeline
 WORKDIR /work/
 
 USER csst
 
-
 ENTRYPOINT ["goagent"]

L1/dockerfiles/csst-msc-l1-sls2d/Makefile

-IMAGE_NAME:=cnic/csst-msc-l1-sls
+IMAGE_NAME:=csu-harbor.csst.nao:10443/cnic/csst-msc-l1-sls
 IMAGE_PATH:=/nfs/tmp/scalebox-images
 build:
+	docker pull csu-harbor.csst.nao:10443/csst/csst-msc-l1-sls
 	docker build --network=host -t $(IMAGE_NAME) .
 
 dist: build

L1/dockerfiles/csst-msc-l1-sls2d/run.sh

@@ -34,19 +34,18 @@ else
     dag_run_id=""
 fi
 echo "dag_run_id:$dag_run_id" >> /work/extra-attributes.txt
-pattern='"sorted_tag":"([^"]+)"'
-if [[ $headers =~ $pattern ]]; then
-    sorted_tag="${BASH_REMATCH[1]}"
-    echo "sorted_tag: $sorted_tag"
-else
-    # no sorted_tag in json
-    sorted_tag=1
-fi
+# pattern='"sorted_tag":"([^"]+)"'
+# if [[ $headers =~ $pattern ]]; then
+#     sorted_tag="${BASH_REMATCH[1]}"
+#     echo "sorted_tag: $sorted_tag"
+# else
+#     # no sorted_tag in json
+#     sorted_tag=1
+# fi
 
 if [ $exit_code -eq 0 ]; then  
-  echo "finish sls, start sink-job."  
-  scalebox task add --header sorted_tag=${sorted_tag} --header dag_run_id=${dag_run_id} --header repeatable=yes --upsert ${message}
-  # scalebox task add $1
+  echo "finish sls."  
+#   scalebox task add --header sorted_tag=${sorted_tag} --header dag_run_id=${dag_run_id} --header repeatable=yes --upsert ${message}
 else  
   echo "finish sls, exit_code: $exit_code"  
 fi