中期版本归档

L1/dockerfiles/csst-msc-l1-ooc/test/app.yaml

 name: msc-l1-ooc.app.process
-label: 在轨定标
+label: 主巡天定标
 comment: 主巡天在轨定标一级流水线
-cluster: local
+cluster: csst
 parameters:
   initial_status: RUNNING
   
@@ -37,9 +37,9 @@ jobs:
     #   bash -c "python /pipeline/src/run.py && echo '---' && cat /pipeline/output/msg.txt"
 
   csst-msc-l1-ooc-exe:
-    label: 在轨定标执行模块
+    label: 主巡天定标执行模块
     base_image: cnic/csst-msc-l1-ooc-exe:latest
-    schedule_mode: HEAD
+    # schedule_mode: HEAD
     parameters:
       start_message: ANY
     variables:
@@ -63,8 +63,10 @@ jobs:
       - ${CSST_CRDS_ROOT}:/crdsroot
     # command: >
     #   python /pipeline/src/run.py {\"brick_id\":1}
-    # hosts:
+    hosts:
       # - h0:1
     #  - c0:1
     #  - c1:1
     #  - c2:1
+     - n0:1
+      # - w2:1
\ No newline at end of file

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

 IMAGE_NAME:=cnic/csst-msc-l1-phot
-
+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-l1-phot.tar
-	ssh c0 docker load -i /share/tmp/msc-l1-phot.tar
-	ssh c1 docker load -i /share/tmp/msc-l1-phot.tar
-	ssh c2 docker load -i /share/tmp/msc-l1-phot.tar
-
+	docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-phot.tar
+	ssh c0 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar
+	ssh c1 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar
+	ssh c2 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar
+	ssh n0 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar
+	ssh n1 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar	
+	ssh w2 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar	
+	ssh w3 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar	
+	ssh w4 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar	
+	ssh w5 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar	
+	ssh w6 docker load -i  $(IMAGE_PATH)/msc-l1-phot.tar	
 push:
 	docker push $(IMAGE_NAME)
 run:

L1/dockerfiles/csst-msc-l1-sls1d/adm/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
 # RUN mkdir -p /work /app/bin && echo "PATH=/app/bin:\${PATH}" >> /root/.bashrc
 WORKDIR /work

L1/dockerfiles/csst-msc-l1-sls1d/adm/Makefile

 IMAGE_NAME:=cnic/csst-msc-l1-sls1d-adm
-
+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-l1-sls1d-adm.tar
-	ssh c0 docker load -i /share/tmp/msc-l1-sls1d-adm.tar
-	ssh c1 docker load -i /share/tmp/msc-l1-sls1d-adm.tar
-	ssh c2 docker load -i /share/tmp/msc-l1-sls1d-adm.tar
-
+	docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-sls1d-adm.tar
+	ssh c0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar
+	ssh c1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar
+	ssh c2 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar
+	ssh n0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar
+	ssh n1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-adm.tar
 push:
 	docker push $(IMAGE_NAME)
 run:

L1/dockerfiles/csst-msc-l1-sls1d/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
 

L1/dockerfiles/csst-msc-l1-sls1d/exe/Makefile

 IMAGE_NAME:=cnic/csst-msc-l1-sls1d-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-l1-sls1d-exe.tar
-	ssh c0 docker load -i /share/tmp/msc-l1-sls1d-exe.tar
-	ssh c1 docker load -i /share/tmp/msc-l1-sls1d-exe.tar
-	ssh c2 docker load -i /share/tmp/msc-l1-sls1d-exe.tar
-
+	docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh c0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh c1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh c2 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh n0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh n1 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh n0 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh w2 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh w3 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh w4 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh w5 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar
+	ssh w6 docker load -i $(IMAGE_PATH)/msc-l1-sls1d-exe.tar			
 push:
 	docker push $(IMAGE_NAME)
 run:

L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml

@@ -38,7 +38,8 @@ jobs:
     #  - h0:1
     #  - c0:1
     #  - c1:1
-      - c2:1
+    #  - c2:1
+      - n0:1
   csst-msc-l1-sls1d-exe:
     label: 无缝光谱1D执行模块
     base_image: cnic/csst-msc-l1-sls1d-exe:latest
@@ -65,6 +66,13 @@ jobs:
     #   python /pipeline/src/run.py {\"brick_id\":1}
     hosts:
     #  - h0:1
-    #  - c0:1
-    #  - c1:1
-      - c2:2
+      - c0:10
+      - c1:10
+      - c2:10
\ No newline at end of file
+      - n0:5
+      - n1:15
+      - w2:15
+      - w3:15
+      - w4:15
+      - w5:15
+      - w6:15  
\ No newline at end of file

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

 IMAGE_NAME:=cnic/csst-msc-l1-sls2d
-
+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-l1-sls2d.tar
-	ssh c0 docker load -i /share/tmp/msc-l1-sls2d.tar
-	ssh c1 docker load -i /share/tmp/msc-l1-sls2d.tar
-	ssh c2 docker load -i /share/tmp/msc-l1-sls2d.tar
+	docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l1-sls2d.tar
+	ssh c0 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar
+	ssh c1 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar
+	ssh c2 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar
+	ssh n0 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar
+	ssh n1 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar	
+	ssh w2 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar	
+	ssh w3 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar	
+	ssh w4 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar	
+	ssh w5 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar	
+	ssh w6 docker load -i $(IMAGE_PATH)/msc-l1-sls2d.tar	
+
 push:
 	docker push $(IMAGE_NAME)
 run:

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

@@ -3,7 +3,7 @@ CLUSTER=csst
 # all: reset build
 
 run:
-	scalebox app create --env-file zjs-ztm.env
+	scalebox app create --env-file zjs.env
 
 reset:
 	cd ${HOME}/docker-scalebox/clusters/$(CLUSTER) && make && cd -

L1/dockerfiles/redis-cli/Dockerfile

-FROM hub.cstcloud.cn/scalebox/agent:0.9
+FROM hub.cstcloud.cn/scalebox/agent
 
 # 安装redis-cli
 RUN apt-get update \

L1/pipelines/app.yaml

-name: ${PIPELINE_NAME}.app.process
-label: csst-${PIPELINE_NAME}
+name: csst-L1.app.process
+label: csst-L1
 #output_basedir: /data/${PIPELINE_NAME}
 cluster: csst
 parameters:
@@ -20,13 +20,15 @@ jobs:
     label: 消息队列接收模块
     base_image: csst/redis-cli
     schedule_mode: HEAD
+    environments:
+      - REDIS_SERVER=192.169.23.2
     # parameters:
     #   start_message: abcd
     sink_jobs:
-      - admL1 
-  admL1:
+      - adm-L1 
+  adm-L1:
     label: 消息分发网关
-    base_image: csst/adml1
+    base_image: csst/adm-l1
     schedule_mode: HEAD
     variables:
       repeated: yes
@@ -37,6 +39,9 @@ jobs:
       - cpic-l1
       - hstdm-l1
       - ifs-l1-rss
+      - mci-l1
+    environments:
+      - CSST_PIPELINE_GRPC_SERVER="192.169.23.2:50051"
   msc-l1-mbi:
     label: 多色成像
     base_image: cnic/csst-msc-l1-mbi
@@ -67,10 +72,11 @@ jobs:
     sink_jobs:
       - msc-l1-phot
     hosts:
-      - h0:1
-      # - c0:1
-      # - c1:1
-      # - c2:1
+#      - h0:1
+      - c0:1
+      - c[1-2]:2
+      - w[2-6]:1
+      - n1:2
   msc-l1-phot:
     label: 测光
     base_image: cnic/csst-msc-l1-phot
@@ -100,17 +106,16 @@ jobs:
     # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
     # sink_jobs:
     hosts:
-      # - h0:1
-      # - c0:1
-      # - c1:1
-      - c2:1      
+      - w[2-6]:20
+      - n1:5
+#      - c[12]:12
   msc-l1-sls2d:
     label: 无缝光谱2D
     base_image: cnic/csst-msc-l1-sls2d
-    schedule_mode: HEAD
+    # schedule_mode: HEAD
     variables:
-      always_running: yes
-      reserved_on_exit: yes
+      # always_running: yes
+      # reserved_on_exit: yes
       # DFS入库错误重试3次
       retry_rules: "['202:3']"
       output_text_size: 100000
@@ -132,14 +137,13 @@ jobs:
     # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
     # sink_jobs:
     hosts:
-      # - h0:1
-      # - c0:1
-      # - c1:1
-      - c2:1
+      - c0:1
+      - w[2-6]:1
+#      - c[0-2]:1
   cpic-l1:
     label: 星冕仪
     base_image: cnic/csst-cpic-l1
-    schedule_mode: HEAD
+    # schedule_mode: HEAD
     variables:
       # always_running: yes
       # reserved_on_exit: yes
@@ -167,8 +171,9 @@ jobs:
     hosts:
       # - h0:1
       # - c0:1
-      - c1:1
+      # - c1:1
       # - c2:1
+      - n0:1
   hstdm-l1:
     label: 太赫兹
     base_image: cnic/csst-hstdm-l1
@@ -196,12 +201,45 @@ jobs:
       - ${CSST_DFS_ROOT}:/dfsroot
       - ${CSST_CRDS_ROOT}:/crdsref
     # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
-    # sink_jobs:
+    sink_jobs:
+      - hstdm-l2
+    hosts:
+      # - h0:1
+      # - c0:1
+      # - c1:1
+      # - c2:1
+      - n0:1   
+  hstdm-l2:
+    label: 太赫兹L2
+    base_image: cnic/csst-hstdm-l2
+    # schedule_mode: HEAD
+    variables:
+      # always_running: yes
+      # reserved_on_exit: yes
+      output_text_size: 100000
+      text_tranc_mode: TAIL
+      locale_mode: NONE
+    parameters:
+      # start_message: 50100000001
+      key_group_regex: ^(.{6})(.{3})$
+      key_group_seq: 1,2
+    environments:
+      - CSST_DFS_API_MODE=${CSST_DFS_API_MODE}
+      - CSST_DFS_GATEWAY=${CSST_DFS_GATEWAY}
+      - CSST_DFS_APP_ID=${CSST_DFS_APP_ID}
+      - CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
+      - CRDS_SERVER_URL=${CRDS_SERVER_URL}
+    paths: 
+      - ${CSST_AUX_DIR}:/pipeline/aux
+      - ${CSST_DFS_ROOT}:/dfsroot
+      - ${CSST_CRDS_ROOT}:/crdsref
+    # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
     hosts:
     #   - h0:1
     #   - c0:1
-      - c1:1
+      # - c1:1
       # - c2:1
+      - n0:1 
   ifs-l1-rss:
     label: IFS单次曝光
     base_image: cnic/csst-ifs-l1-rss
@@ -221,10 +259,43 @@ jobs:
       - ${AUX_DIR}:/L1Pipeline/aux
       - ${CRDS_DIR}:/L1Pipeline/crds
       - ${DFS_ROOT}:/L1Pipeline/dfs
+      - /sharewcl/shao/docker/csst_ifs_l1_rss/code:/L1Pipeline/workspace
     # command: docker run -d --network=host %ENVS% %VOLUMES% {{IMAGE}}
     # sink_jobs:
     hosts:
       # - h0:1
-      - c0:1
+      # - c0:1
+      # - c1:2
+      # - c2:2 
+      - n0:1    
+  mci-l1: 
+    label: 多通道成像仪定标
+    base_image: cnic/csst-mci-l1
+    # schedule_mode: HEAD
+    variables:
+      # DFS入库错误重试3次
+      retry_rules: "['202:3']"    
+      output_text_size: 100000
+      text_tranc_mode: TAIL
+      locale_mode: NONE
+    parameters:
+      key_group_regex: ^(.{6})(.{3})$
+      key_group_seq: 1,2
+      # start_message: 20100000001
+    paths: 
+      - ${AUX_DIR}:/L1Pipeline/aux
+      - ${CRDS_DIR}:/L1Pipeline/crds
+      - ${DFS_ROOT}:/L1Pipeline/dfs
+      - /sharewcl/shao/docker/csst_mci_l1/code:/L1Pipeline/workspace
+    # paths: 
+    #   - ${AUX_DIR}:/L1Pipeline/aux
+    #   - ${CRDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds
+    #   - ${DFS_ROOT}:/dfsroot
+    # command: docker run -d --network=host %ENVS% %VOLUMES% {{IMAGE}}
+    # sink_jobs:
+    hosts:
+      # - h0:1
+      # - c0:2
       # - c1:2
       # - c2:2
+      - n0:1

L1/pipelines/zjs-ztm.env

+# DFS
+CSST_DFS_API_MODE=cluster
+CSST_DFS_GATEWAY=172.24.27.2:30880
+CSST_DFS_APP_ID=test
+CSST_DFS_APP_TOKEN=test
+# CRDS
+CRDS_SERVER_URL=http://172.24.27.2:29000
+
+# VOLUMES ==================
+CSST_DFS_ROOT=/share/dfs
+CSST_CRDS_ROOT=/share/crdsdata/data
+CSST_AUX_DIR=/share/pipeline/aux
+
+# IFS CHENWEI
+AUX_DIR=/share/shao/L1Pipeline/aux
+CRDS_DIR=/share/shao/L1Pipeline/crds
+DFS_ROOT=/share/dfs 
\ No newline at end of file

L1/pipelines/zjs.env

@@ -12,9 +12,9 @@ CSST_CRDS_ROOT=/sharewcl/crdsdata/data
 CSST_AUX_DIR=/sharewcl/pipeline/aux
 
 # IFS CHENWEI
-AUX_DIR=/share/shao/L1Pipeline/aux
-CRDS_DIR=/share/shao/L1Pipeline/crds
-DFS_ROOT=/share/dfs 
+AUX_DIR=/sharewcl/shao/L1Pipeline/aux
+CRDS_DIR=/sharewcl/shao/L1Pipeline/crds
+DFS_ROOT=/sharewcl/dfs 
 
 PIPELINE_NAME=csst_lever1
 #PIPELINE_NAME=mbi

L1/redis_server/README.md

 # 模拟DFS发送redis消息
 ```bash
-for line in {10160000000..10160000001}; do 
+# mbi sls2d
+for line in {10160000000..10160000136}; do 
     echo $line; 
-    redis-cli -h 192.169.23.2 -a 123456 lpush single-image-reduction:obsid $line; 
+    redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid $line; 
+done
+#mci
+for line in {20100000001..20100000005}; do 
+    echo $line; 
+    redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid $line; 
+done
+
+#ifs-rss
+for line in {30100000003..30100000050}; do 
+    echo $line; 
+    redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid $line; 
+done
+
+#cpic
+for line in {41000000101..41000000104}; do 
+    echo $line; 
+    redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid $line; 
+done
+
+#hstdm
+for line in {50100000001..50100000002}; do 
+    echo $line; 
+    redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid $line; 
 done
 ```
 redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid 10160000000; 
+redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid 20100000001;
 redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid 30100000003; 
 redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid 41000000101; 
 redis-cli -h 127.0.0.1 -a 123456 lpush single-image-reduction:obsid 50100000001;
+
+
+## 数据库导入导出
+## 进入database容器
+### 数据导出
+pg_dump -h 127.0.0.1 -p 5432 -U scalebox -d scalebox -Fc -f ~/scalebox.sql
+### 数据导入
+pg_restore -h 127.0.0.1 -U scalebox -d scalebox /scalebox.sql
+
+
+
+## 导数据步骤
+### 1紫金山考出数据
+docker exec cf32ca2842e8 pg_dump -U scalebox --data-only --dbname=scalebox > scalebox.sql
+
+### 2传入到要拷贝数据的数据库容器内
+docker cp scalebox.sql a3e398828977:/tmp/scalebox.sql
+
+### 3进入容器并登陆数据库
+docker exec -it a3e398828977 bash
+psql -U scalebox -d scalebox
+
+### 4执行插入命令
+\i /tmp/scalebox.sql
\ No newline at end of file

L2/dockerfiles/csst-hstdm-l2/Makefile

 IMAGE_NAME:=cnic/csst-hstdm-l2
-
+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/hstdm-l2.tar
-	ssh c0 docker load -i /share/tmp/hstdm-l2.tar
-	ssh c1 docker load -i /share/tmp/hstdm-l2.tar
-	ssh c2 docker load -i /share/tmp/hstdm-l2.tar
-
+	docker save $(IMAGE_NAME) > $(IMAGE_PATH)/hstdm-l2.tar
+	ssh c0 docker load -i  $(IMAGE_PATH)/hstdm-l2.tar
+	ssh c1 docker load -i  $(IMAGE_PATH)/hstdm-l2.tar
+	ssh c2 docker load -i  $(IMAGE_PATH)/hstdm-l2.tar
+	ssh n0 docker load -i  $(IMAGE_PATH)/hstdm-l2.tar
+	ssh n1 docker load -i  $(IMAGE_PATH)/hstdm-l2.tar
 push:
 	docker push $(IMAGE_NAME)
 run:

L2/dockerfiles/csst-hstdm-l2/run.sh

@@ -13,6 +13,6 @@ fi
 
 rm -rf /pipeline/input/* /pipeline/output/*
 
-echo finish hstdm.
+echo finish hstdm-l2.
 
 exit $exit_code

L2/dockerfiles/csst-hstdm-l2/test/app.yaml

 name: hstdm.app.process
 label: 太赫兹
 comment: 精测模块太赫兹1+2级流水线
-cluster: local
+cluster: csst
 parameters:
   initial_status: RUNNING
   
@@ -9,7 +9,7 @@ jobs:
   hstdm-l1:
     label: 太赫兹
     base_image: cnic/csst-hstdm-l1
-    schedule_mode: HEAD
+    # schedule_mode: HEAD
     variables:
       # always_running: yes
       # reserved_on_exit: yes
@@ -33,18 +33,19 @@ jobs:
     # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
     sink_jobs:
       - hstdm-l2
-    # hosts:
+    hosts:
       # - h0:1
       # - c0:1
       # - c1:1
       # - c2:1
+      - n0:1
   hstdm-l2:
     label: 太赫兹L2
     base_image: cnic/csst-hstdm-l2
-    schedule_mode: HEAD
+    # schedule_mode: HEAD
     variables:
-      always_running: yes
-      reserved_on_exit: yes
+      # always_running: yes
+      # reserved_on_exit: yes
       output_text_size: 100000
       text_tranc_mode: TAIL
       locale_mode: NONE
@@ -63,10 +64,11 @@ jobs:
       - ${CSST_DFS_ROOT}:/dfsroot
       - ${CSST_CRDS_ROOT}:/crdsref
     # command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
-    # hosts:
+    hosts:
     #   - h0:1
     #   - c0:1
       # - c1:1
       # - c2:1
+      - n0:1      
 
       

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

-IMAGE_ADM:=cnic/csst-msc-l1-mbi
-
-build:
-	make -C adm build
-	make -C exe build
-
-sync:
-	rsync -av --del . csst-zjs:/tmp/csst-msc-l2-xcat
-
-dist:
-	docker save hub.cstcloud.cn/scalebox/base:latest | zstdmt  | pv | ssh csst-zjs 'zstd -d | docker load'
-	# docker save hub.cstcloud.cn/scalebox/controld:latest | zstdmt  | pv | ssh csst-zjs 'zstd -d | docker load'
-	# docker save hub.cstcloud.cn/scalebox/database:latest | zstdmt  | pv | ssh csst-zjs 'zstd -d | docker load'
-
-push:
-	docker push $(IMAGE_NAME)
-run:
-	docker run -it --entrypoint bash $(IMAGE_NAME)
-down:
-	docker stop $(IMAGE_NAME)

L2/dockerfiles/csst-msc-l2-xcat/adm/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
 # RUN mkdir -p /work /app/bin && echo "PATH=/app/bin:\${PATH}" >> /root/.bashrc
 WORKDIR /work

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

 IMAGE_NAME:=cnic/csst-msc-l2-xcat-adm
-
+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-adm.tar
-	ssh c0 docker load -i /share/tmp/msc-l2-xcat-adm.tar
-	ssh c1 docker load -i /share/tmp/msc-l2-xcat-adm.tar
-	ssh c2 docker load -i /share/tmp/msc-l2-xcat-adm.tar
-
+	docker save $(IMAGE_NAME) > $(IMAGE_PATH)/msc-l2-xcat-adm.tar
+	ssh c0 docker load -i $(IMAGE_PATH)/msc-l2-xcat-adm.tar
+	ssh c1 docker load -i $(IMAGE_PATH)/msc-l2-xcat-adm.tar
+	ssh c2 docker load -i $(IMAGE_PATH)/msc-l2-xcat-adm.tar
+	ssh n0 docker load -i $(IMAGE_PATH)/msc-l2-xcat-adm.tar
+	ssh n1 docker load -i $(IMAGE_PATH)/msc-l2-xcat-adm.tar
 push:
 	docker push $(IMAGE_NAME)
 run: