中期版本归档

L2/dockerfiles/csst-msc-l2-xcat/app.yaml

-name: msc-l2-xcat.app.process
-label: 星表检索
-comment: 星表检索
-cluster: csst
-parameters:
-  initial_status: RUNNING
-  
-jobs:
-  # msc-l1-mbi:
-  #   label: 星表管理模块
-  #   base_image: cnic/csst-msc-l1-mbi
-  #   schedule_mode: HEAD
-  #   variables:
-  #     always_runing: yes
-  #     output_text_size: 100000
-  #     text_tranc_mode: TAIL
-  #     locale_mode: NONE
-  #   paths: 
-  #     - ${AUX_DIR}:/pipeline/aux
-  #     - ${CRDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds
-  #     - ${DFS_ROOT}:/dfsroot
-
-  csst-msc-l2-xcat-adm:
-    label: 星表管理模块
-    base_image: cnic/csst-msc-l2-xcat-adm:latest
-    schedule_mode: HEAD
-    variables:
-      #always_running: yes
-      output_text_size: 100000
-      text_tranc_mode: TAIL
-      locale_mode: NONE
-    parameters:
-      start_message: 202306212339
-    environments:
-      - CSST_DFS_API_MODE=cluster
-      - CSST_DFS_GATEWAY=172.24.27.2:30880
-      - CSST_DFS_APP_ID=test
-      - CSST_DFS_APP_TOKEN=test
-    paths: # change /share to /sharewcl in PML production environment
-      - /sharewcl/pipeline/output-csst-msc-l2-xcat-adm:/pipeline/output # output directory, omit this line in production
-      - /sharewcl/pipeline/aux:/pipeline/aux
-      - /sharewcl/dfs:/dfsroot
-      - /sharewcl/crdsdata/data/references:/crdsref
-    sink_jobs:
-      - csst-msc-l2-xcat-exe
-    # command: >
-    #   bash -c "python /pipeline/src/run.py && echo '---' && cat /pipeline/output/msg.txt"
-    hosts:
-    #  - h0:1
-    #  - c0:1
-    #  - c1:1
-    #  - c2:1
-  csst-msc-l2-xcat-exe:
-    base_image: cnic/csst-msc-l2-xcat-exe:latest
-    #schedule_mode: HEAD
-    variables:
-      always_running: yes
-      output_text_size: 100000
-      text_tranc_mode: TAIL
-      locale_mode: NONE
-    environments:
-      - CSST_DFS_API_MODE=cluster
-      - CSST_DFS_GATEWAY=172.24.27.2:30880
-      - CSST_DFS_APP_ID=test
-      - CSST_DFS_APP_TOKEN=test
-    paths: # change /share to /sharewcl in PML production environment
-      # output directory, omit this line in production
-      - /sharewcl/pipeline/output-csst-msc-l2-xcat-exe:/pipeline/output
-      - /sharewcl/pipeline/aux:/pipeline/aux
-      - /sharewcl/dfs:/dfsroot
-      - /sharewcl/crdsdata/data/references:/crdsref
-    # command: >
-    #   python /pipeline/src/run.py {\"brick_id\":1}
-    hosts:
-    #  - h0:1
-    #  - c0:1
-    #  - c1:1
-      - c2:2    
\ No newline at end of file

L2/dockerfiles/csst-msc-l2-xcat/exe/Dockerfile

@@ -4,7 +4,7 @@ USER root
 COPY run.sh /app/bin/
 RUN chmod +x /app/bin/run.sh
 
-COPY --from=hub.cstcloud.cn/scalebox/base:0.9 /usr/local/sbin/ /usr/local/sbin/
+COPY --from=hub.cstcloud.cn/scalebox/base /usr/local/sbin/ /usr/local/sbin/
 RUN mkdir -p /work && echo "PATH=/app/bin:\${PATH}" >> /root/.bashrc
 WORKDIR /work
 

L2/dockerfiles/csst-msc-l2-xcat/exe/Makefile

 IMAGE_NAME:=cnic/csst-msc-l2-xcat-exe
-
+IMAGE_PATH:=/sharewcl/temp
 build:
 	docker build --network=host -t $(IMAGE_NAME) .
 
-dist:
+dist: build
 #docker save $(IMAGE_NAME) | zstdmt | pv | ssh c0 'zstd -d | docker load'
-	docker save $(IMAGE_NAME) > /share/tmp/msc-l2-xcat-exe.tar
-	ssh c0 docker load -i /share/tmp/msc-l2-xcat-exe.tar
-	ssh c1 docker load -i /share/tmp/msc-l2-xcat-exe.tar
-	ssh c2 docker load -i /share/tmp/msc-l2-xcat-exe.tar
-
+	docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l2-xcat-exe.tar
+	ssh c0 docker load -i $(IMAGE_PATH)/msc-l2-xcat-exe.tar
+	ssh c1 docker load -i $(IMAGE_PATH)/msc-l2-xcat-exe.tar
+	ssh c2 docker load -i $(IMAGE_PATH)/msc-l2-xcat-exe.tar
+	ssh n0 docker load -i $(IMAGE_PATH)/msc-l2-xcat-exe.tar
+	ssh n1 docker load -i $(IMAGE_PATH)/msc-l2-xcat-exe.tar
 push:
 	docker push $(IMAGE_NAME)
 run:

L2/dockerfiles/csst-msc-l2-xcat/test/app.yaml

@@ -9,7 +9,7 @@ jobs:
   csst-msc-l2-xcat-adm:
     label: 星表合并管理模块
     base_image: cnic/csst-msc-l2-xcat-adm:latest
-    schedule_mode: HEAD
+    #schedule_mode: HEAD
     variables:
       # always_running: yes
       output_text_size: 100000
@@ -30,7 +30,12 @@ jobs:
       - csst-msc-l2-xcat-exe
     # command: >
     #   bash -c "python /pipeline/src/run.py && echo '---' && cat /pipeline/output/msg.txt"
-
+    hosts:
+    #  - h0:1
+    #  - c0:1
+    #  - c1:1
+    #  - c2:2
+      - n0:1
   csst-msc-l2-xcat-exe:
     label: 星表合并执行模块
     base_image: cnic/csst-msc-l2-xcat-exe:latest
@@ -58,4 +63,5 @@ jobs:
     #  - h0:1
     #  - c0:1
     #  - c1:1
-     - c2:2
+    #  - c2:2
\ No newline at end of file
+      - n0:1
\ No newline at end of file