modify docker container define

L1/dockerfiles/csst-ifs-l1-rss/Dockerfile

 FROM csst/csst-ifs-l1-rss:latest
 LABEL maintainer="Xiaoli Zhang<zhangxiaoli@cnic.cn>"
 
+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

L1/dockerfiles/csst-ifs-l1-rss/test/add_task.sh

@@ -8,6 +8,7 @@ PGPORT=5432
 
 job_id=$1
 
+#for m in {30100000001..30100000050}; do
 for m in {30100000003..30100000050}; do
     echo $m
     docker exec -t database psql -U ${POSTGRES_USER} -h ${POSTGRES_HOST} -d ${POSTGRES_DB} -p ${PGPORT} \

L1/dockerfiles/csst-ifs-l1-rss/test/app.yaml

@@ -6,12 +6,12 @@ parameters:
 jobs:
   ifs-l1-rss:
     base_image: cnic/csst-ifs-l1-rss
-    # schedule_mode: HEAD
+    schedule_mode: HEAD
     variables:
       output_text_size: 100000
       text_tranc_mode: TAIL
       locale_mode: NONE
-      # grpc_server: 172.24.23.6:50051
+      grpc_server: 172.24.23.6:50051
     parameters:
       # start_message: scalebox
       key_group_regex: ^(.{6})(.{3})$
@@ -20,10 +20,11 @@ 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:
+    # hosts:
     #   - h0:1
-      - c0:2
+    #   - c0:2
     #   - c1:2
     #   - c2:2

L1/dockerfiles/csst-ifs-l1-rss/test/zjs.env

 # AUX_DIR=/sharewcl/shao/L1Pipeline/aux
 # CRDS_DIR=/sharewcl/shao/L1Pipeline/crds
 # DFS_ROOT=/sharewcl/shao/L1Pipeline/dfs
-
-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
+#AUX_DIR=/share/shao/L1Pipeline/aux
\ No newline at end of file
+#CRDS_DIR=/share/shao/L1Pipeline/crds
+#DFS_ROOT=/share/dfs

L1/dockerfiles/csst-mci-l1/Dockerfile

 FROM csst/csst-mci-l1:latest
+
 LABEL maintainer="Xiaoli Zhang<zhangxiaoli@cnic.cn>"
 
 COPY run.sh /app/bin/

L1/dockerfiles/csst-mci-l1/Makefile

-IMAGE_NAME:=csst/mci-l1
+IMAGE_NAME:=cnic/csst-mci-l1
 
 build:
 	docker build --network=host -t $(IMAGE_NAME) .

L1/dockerfiles/csst-mci-l1/run.sh

 #!/bin/bash
-obsid="xxxxxxxxxxxx"
 
-# python l1_pipeline_script_mci_shao_simdata.py $obsid > ./stdout
-python /L1Pipeline/workspace/helloworld.py
+
+# obsid="30100000001"
+
+obsid=$1
+
+python /L1Pipeline/workspace/l1_pipeline_script_mci_shao_simdata.py $obsid
 
 exit_code=$?
+
+mkdir -p /work
+# echo "=====csst-l1-ifs-rss.log====" > /work/user-file.txt
+# cat /L1Pipeline/workspace/ifs/rss/proc_data/path_RSSlog.txt >> /work/user-file.txt
+
+# rm -rf /L1Pipeline/L0/* /L1Pipeline/L1/*
+
+# mv /tmp/timestamps.txt /work/timestamps.txt
+
+echo finish mci pipeline.
+
+exit $exit_code
+
+

L1/dockerfiles/csst-mci-l1/test/add_task.sh

+
+#!/bin/bash
+
+POSTGRES_USER=scalebox
+POSTGRES_HOST=localhost
+POSTGRES_DB=scalebox
+PGPORT=5432
+
+job_id=$1
+
+#for m in {20100000001..20100000005}; do
+for m in {20100000002..20100000005}; do
+    echo $m
+    docker exec -t database psql -U ${POSTGRES_USER} -h ${POSTGRES_HOST} -d ${POSTGRES_DB} -p ${PGPORT} \
+        -c "INSERT INTO t_task(job,key_message) VALUES(${job_id},'${m}')"
+
+done

L1/dockerfiles/csst-mci-l1/test/app.yaml

@@ -5,7 +5,8 @@ parameters:
 
 jobs:
   mci-l1: 
-    base_image: csst/mci-l1
+    base_image: cnic/csst-mci-l1
+    schedule_mode: HEAD
     variables:
       output_text_size: 100000
       text_tranc_mode: TAIL
@@ -13,6 +14,12 @@ jobs:
     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

L1/dockerfiles/csst-mci-l1/test/zjs.env

-AUX_DIR=/sharewcl/L1Pipeline/aux
-CRDS_DIR=/sharewcl/OnOrbitCal/SimData/ref_202211/products_ref20_3hdr
+AUX_DIR=/sharewcl/shao/L1Pipeline/aux
+CRDS_DIR=/sharewcl/shao/L1Pipeline/crds
 DFS_ROOT=/sharewcl/dfs
+