diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile b/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile index 7c1450af778bb63229b2859df928518f3b28cd8c..bbf3090b4dbf207fecee2f39c5d3919ee9729966 100644 --- a/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile +++ b/L1/dockerfiles/csst-msc-l1-sls2d/Dockerfile @@ -1,5 +1,6 @@ FROM csst/csst-msc-l1-sls2d:latest +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 diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/Makefile b/L1/dockerfiles/csst-msc-l1-sls2d/Makefile index e6571b6f2c13279c3d44c5be67d0fd2a309143be..6538ad5be224455fe93ae9f970a7ea3ded14e3ea 100644 --- a/L1/dockerfiles/csst-msc-l1-sls2d/Makefile +++ b/L1/dockerfiles/csst-msc-l1-sls2d/Makefile @@ -16,4 +16,6 @@ run: down: docker stop $(IMAGE_NAME) scp: - scp -r ./ csst-zjs:/root/csst/sls2d/ \ No newline at end of file + scp -r ./ csst-zjs:/root/csst/csst-msc-l1-sls2d/ +save: + docker save $(IMAGE_NAME) > /sharewcl/temp/msc-l1-sls2d.tar \ No newline at end of file diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile b/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile index 0e709ce8a1ebf4ba2de48f361fe44c1d1624a36a..65fefa37a0f1d236c95b2d9d95e97c34f6b1969b 100644 --- a/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile +++ b/L1/dockerfiles/csst-msc-l1-sls2d/test/Makefile @@ -3,7 +3,7 @@ CLUSTER=csst # all: reset build run: - scalebox app create --env-file zjs.env + scalebox app create --env-file zjs-ztm.env reset: cd ${HOME}/docker-scalebox/clusters/$(CLUSTER) && make && cd - diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml b/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml index d7fdb86cfac485d79c8bdd9c4589ae972a987a54..42d97a676c4961f04c5bcd724604c004d5b2ded2 100644 --- a/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml +++ b/L1/dockerfiles/csst-msc-l1-sls2d/test/app.yaml @@ -18,13 +18,14 @@ jobs: output_text_size: 100000 text_tranc_mode: TAIL locale_mode: NONE + grpc_server: 172.24.23.6:50051 parameters: key_group_regex: ^(.{6})(.{3})$ key_group_seq: 1,2 paths: - - ${AUX_DIR}:/pipeline/aux - - ${CRDS_DIR}:/L1Pipeline/aux/C6.1_ref_crds - - ${DFS_ROOT}:/dfsroot + - ${CSST_AUX_DIR}:/pipeline/aux + - ${CSST_DFS_ROOT}:/dfsroot + - ${CSST_CRDS_ROOT}:/crdsroot # sink_jobs: # hosts: # - h0:1 diff --git a/L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env b/L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env new file mode 100644 index 0000000000000000000000000000000000000000..b5c0ed1a35e3a793421b65a76d38e4ad08ba70d8 --- /dev/null +++ b/L1/dockerfiles/csst-msc-l1-sls2d/test/zjs-ztm.env @@ -0,0 +1,12 @@ +# 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