Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
csst
Scalebox Apps
Commits
7f892f4f
Commit
7f892f4f
authored
5 months ago
by
Zhang Xiaoli
Browse files
Options
Download
Email Patches
Plain Diff
部署到之江实验室环境,修改相关配置
parent
225b9a01
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
108 additions
and
27 deletions
+108
-27
L1/dockerfiles/csst-msc-l1-mbi-photmix/Dockerfile
L1/dockerfiles/csst-msc-l1-mbi-photmix/Dockerfile
+1
-1
L1/dockerfiles/csst-msc-l1-mbi-photmix/Makefile
L1/dockerfiles/csst-msc-l1-mbi-photmix/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/Makefile
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/app.yaml
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/app.yaml
+4
-4
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/zj.env
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/zj.env
+27
-0
L1/dockerfiles/csst-msc-l1-mbi/Dockerfile
L1/dockerfiles/csst-msc-l1-mbi/Dockerfile
+1
-1
L1/dockerfiles/csst-msc-l1-mbi/Makefile
L1/dockerfiles/csst-msc-l1-mbi/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-mbi/test/Makefile
L1/dockerfiles/csst-msc-l1-mbi/test/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-mbi/test/app.yaml
L1/dockerfiles/csst-msc-l1-mbi/test/app.yaml
+4
-4
L1/dockerfiles/csst-msc-l1-mbi/test/zj.env
L1/dockerfiles/csst-msc-l1-mbi/test/zj.env
+27
-0
L1/dockerfiles/csst-msc-l1-qc0/Dockerfile
L1/dockerfiles/csst-msc-l1-qc0/Dockerfile
+1
-1
L1/dockerfiles/csst-msc-l1-qc0/Makefile
L1/dockerfiles/csst-msc-l1-qc0/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-qc0/test/Makefile
L1/dockerfiles/csst-msc-l1-qc0/test/Makefile
+1
-1
L1/dockerfiles/csst-msc-l1-qc0/test/app.yaml
L1/dockerfiles/csst-msc-l1-qc0/test/app.yaml
+4
-4
L1/dockerfiles/csst-msc-l1-qc0/test/zj.env
L1/dockerfiles/csst-msc-l1-qc0/test/zj.env
+27
-0
L1/dockerfiles/redis-cli/Dockerfile
L1/dockerfiles/redis-cli/Dockerfile
+1
-1
L1/dockerfiles/redis-cli/Makefile
L1/dockerfiles/redis-cli/Makefile
+2
-2
L1/dockerfiles/redis-cli/run.sh
L1/dockerfiles/redis-cli/run.sh
+2
-2
L1/dockerfiles/redis-cli/test.sh
L1/dockerfiles/redis-cli/test.sh
+1
-1
No files found.
L1/dockerfiles/csst-msc-l1-mbi-photmix/Dockerfile
View file @
7f892f4f
FROM
10.3.10.10:8113
/csst/csst-msc-l1-mbi-photmix
FROM
zjlab-harbor.csst.nao
/csst/csst-msc-l1-mbi-photmix
USER
root
COPY
run.sh /app/bin/
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi-photmix/Makefile
View file @
7f892f4f
IMAGE_NAME
:=
cnic/csst-msc-l1-mbi-photmix
IMAGE_PATH
:=
/
nfs
data/tmp
IMAGE_PATH
:=
/data/
scalebox/
tmp
build
:
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/Makefile
View file @
7f892f4f
...
...
@@ -4,7 +4,7 @@ all: reset build
run
:
# PGHOST=192.168.25.27 GRPC_SERVER=192.168.25.27 scalebox app create --env-file csu.env
PGPORT
=
9090 scalebox app create
--env-file
nao
.env
PGPORT
=
9090 scalebox app create
--env-file
zj
.env
reset
:
cd
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
&&
make
&&
cd
-
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/app.yaml
View file @
7f892f4f
...
...
@@ -28,10 +28,10 @@ jobs:
-
CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
-
CCDS_SERVER_URL=${CCDS_SERVER_URL}
paths
:
-
${CSST_AUX_ROOT}:/pipeline/aux
:ro
-
${CSST_DFS_ROOT}:/dfs_root
:ro
-
${CCDS_ROOT}:/ccds_root
:ro
-
${CSST_AST_TEMP}:/pipeline/temp
:rw
-
${CSST_AUX_ROOT}:/pipeline/aux
-
${CSST_DFS_ROOT}:/dfs_root
-
${CCDS_ROOT}:/ccds_root
-
${CSST_AST_TEMP}:/pipeline/temp
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
hosts
:
-
h0:5
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi-photmix/test/zj.env
0 → 100644
View file @
7f892f4f
# DFS
CSST_DFS_GATEWAY=172.24.232.11:30880
CSST_DFS_API_MODE=cluster
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
CSST_DFS_LOGS_DIR=.
# CCDS
CCDS_SERVER_URL=http://172.24.232.11:29000
CCDS_USER=USER
CCDS_PASS=PASS
# VOLUMES
# /dfs_root:ro
CSST_DFS_ROOT=/data/dfs/files
# /ccds_root:ro
CCDS_ROOT=/data/ccds/files
# /pipeline/temp:rw
CSST_AST_TEMP=/data/ast_temp
# HARBOR
HARBOR=zjlab-harbor.csst.nao
# TEST
CSST_INTTEST_ROOT=/data/pipeline-inttest
VERBOSE=true
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi/Dockerfile
View file @
7f892f4f
FROM
10.3.10.10:8113
/csst/csst-msc-l1-mbi
FROM
zjlab-harbor.csst.nao
/csst/csst-msc-l1-mbi
USER
root
COPY
run.sh /app/bin/
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi/Makefile
View file @
7f892f4f
IMAGE_NAME
:=
cnic/csst-msc-l1-mbi
IMAGE_PATH
:=
/
nfs
data/tmp
IMAGE_PATH
:=
/data/
scalebox/
tmp
build
:
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi/test/Makefile
View file @
7f892f4f
...
...
@@ -4,7 +4,7 @@ all: reset build
run
:
# PGHOST=192.168.25.27 GRPC_SERVER=192.168.25.27 scalebox app create --env-file csu.env
PGPORT
=
9090 scalebox app create
--env-file
nao
.env
PGPORT
=
9090 scalebox app create
--env-file
zj
.env
reset
:
cd
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
&&
make
&&
cd
-
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi/test/app.yaml
View file @
7f892f4f
...
...
@@ -28,10 +28,10 @@ jobs:
-
CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
-
CCDS_SERVER_URL=${CCDS_SERVER_URL}
paths
:
-
${CSST_AUX_ROOT}:/pipeline/aux
:ro
-
${CSST_DFS_ROOT}:/dfs_root
:ro
-
${CCDS_ROOT}:/ccds_root
:ro
-
${CSST_AST_TEMP}:/pipeline/temp
:rw
-
${CSST_AUX_ROOT}:/pipeline/aux
-
${CSST_DFS_ROOT}:/dfs_root
-
${CCDS_ROOT}:/ccds_root
-
${CSST_AST_TEMP}:/pipeline/temp
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
sink_jobs
:
-
msc-l1-mbi-photmix
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-mbi/test/zj.env
0 → 100644
View file @
7f892f4f
# DFS
CSST_DFS_GATEWAY=172.24.232.11:30880
CSST_DFS_API_MODE=cluster
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
CSST_DFS_LOGS_DIR=.
# CCDS
CCDS_SERVER_URL=http://172.24.232.11:29000
CCDS_USER=USER
CCDS_PASS=PASS
# VOLUMES
# /dfs_root:ro
CSST_DFS_ROOT=/data/dfs/files
# /ccds_root:ro
CCDS_ROOT=/data/ccds/files
# /pipeline/temp:rw
CSST_AST_TEMP=/data/ast_temp
# HARBOR
HARBOR=zjlab-harbor.csst.nao
# TEST
CSST_INTTEST_ROOT=/data/pipeline-inttest
VERBOSE=true
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-qc0/Dockerfile
View file @
7f892f4f
FROM
10.3.10.10:8113
/csst/csst-msc-l1-qc0
FROM
zjlab-harbor.csst.nao
/csst/csst-msc-l1-qc0
USER
root
COPY
run.sh /app/bin/
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-qc0/Makefile
View file @
7f892f4f
IMAGE_NAME
:=
cnic/csst-msc-l1-qc0
IMAGE_PATH
:=
/
nfs
data/tmp
IMAGE_PATH
:=
/data/
scalebox/
tmp
build
:
docker build
--network
=
host
-t
$(IMAGE_NAME)
.
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-qc0/test/Makefile
View file @
7f892f4f
...
...
@@ -4,7 +4,7 @@ all: reset build
run
:
# PGHOST=192.168.25.27 GRPC_SERVER=192.168.25.27 scalebox app create --env-file csu.env
PGPORT
=
9090 scalebox app create
--env-file
nao
.env
PGPORT
=
9090 scalebox app create
--env-file
zj
.env
reset
:
cd
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
&&
make
&&
cd
-
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-qc0/test/app.yaml
View file @
7f892f4f
...
...
@@ -28,10 +28,10 @@ jobs:
-
CSST_DFS_APP_TOKEN=${CSST_DFS_APP_TOKEN}
-
CCDS_SERVER_URL=${CCDS_SERVER_URL}
paths
:
-
${CSST_AUX_ROOT}:/pipeline/aux
:ro
-
${CSST_DFS_ROOT}:/dfs_root
:ro
-
${CCDS_ROOT}:/ccds_root
:ro
-
${CSST_AST_TEMP}:/pipeline/temp
:rw
-
${CSST_AUX_ROOT}:/pipeline/aux
-
${CSST_DFS_ROOT}:/dfs_root
-
${CCDS_ROOT}:/ccds_root
-
${CSST_AST_TEMP}:/pipeline/temp
# command: docker run -d --network=host %ENVS% %VOLUMES% %IMAGE%
hosts
:
-
h0:1
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/csst-msc-l1-qc0/test/zj.env
0 → 100644
View file @
7f892f4f
# DFS
CSST_DFS_GATEWAY=172.24.232.11:30880
CSST_DFS_API_MODE=cluster
CSST_DFS_APP_ID=test
CSST_DFS_APP_TOKEN=test
CSST_DFS_LOGS_DIR=.
# CCDS
CCDS_SERVER_URL=http://172.24.232.11:29000
CCDS_USER=USER
CCDS_PASS=PASS
# VOLUMES
# /dfs_root:ro
CSST_DFS_ROOT=/data/dfs/files
# /ccds_root:ro
CCDS_ROOT=/data/ccds/files
# /pipeline/temp:rw
CSST_AST_TEMP=/data/ast_temp
# HARBOR
HARBOR=zjlab-harbor.csst.nao
# TEST
CSST_INTTEST_ROOT=/data/pipeline-inttest
VERBOSE=true
This diff is collapsed.
Click to expand it.
L1/dockerfiles/redis-cli/Dockerfile
View file @
7f892f4f
...
...
@@ -7,7 +7,7 @@ RUN apt-get update \
ENTRYPOINT
[]
#ENV REDIS_SERVER=10.0.0.9
ENV
REDIS_SERVER=1
0.3.10.28
ENV
REDIS_SERVER=1
72.24.232.12
ENV
REDIS_PORT=26379
ENV
REDIS_PWD=csst__2025
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/redis-cli/Makefile
View file @
7f892f4f
...
...
@@ -9,8 +9,8 @@ dist:
push
:
docker push
$(IMAGE_NAME)
run-bash
:
docker run
-it
--entrypoint
bash
-e
PGHOST
=
1
0.3.10.28:9090
-e
GRPC_SERVER
=
1
0.3.10.28
-v
${PWD}
/config:/config
$(IMAGE_NAME)
docker run
-it
--entrypoint
bash
-e
PGHOST
=
1
72.24.232.14:5432
-e
GRPC_SERVER
=
1
72.24.232.14
-v
${PWD}
/config:/config
$(IMAGE_NAME)
run
:
docker run
-d
-e
PGHOST
=
1
0.3.10.28:9090
-e
GRPC_SERVER
=
1
0.3.10.28
-v
${PWD}
/config:/config
$(IMAGE_NAME)
docker run
-d
-e
PGHOST
=
1
72.24.232.14:5432
-e
GRPC_SERVER
=
1
72.24.232.14
-v
${PWD}
/config:/config
$(IMAGE_NAME)
down
:
docker stop
$(IMAGE_NAME)
This diff is collapsed.
Click to expand it.
L1/dockerfiles/redis-cli/run.sh
View file @
7f892f4f
#!/bin/bash
# json串
# "{\"dag_id\": \"csst-msc-l1-mbi\",
\"parameters\": {
\"dag_run_id\": \"202411111505581036\", \"message\": {\"obsid\": \"11009101682009\", \"chipid\": \"24\"}}
}
"
# "{\"dag_id\": \"csst-msc-l1-mbi\", \"dag_run_id\": \"202411111505581036\", \"message\": {\"obsid\": \"11009101682009\", \"chipid\": \"24\"}}"
while
true
do
# obsid=$(redis-cli -h ${REDIS_SERVER} -p ${REDIS_PORT} rpop single-image-reduction:obsid)
msg
=
$(
redis-cli
-h
${
REDIS_SERVER
}
-p
${
REDIS_PORT
}
-a
${
REDIS_PWD
}
rpop csst_data_list
)
# msg=$(redis-cli -h 1
0.3.10.28
-a 123456 lpop csst_data_list_zxl)
# msg=$(redis-cli -h 1
72.24.232.14
-a 123456 lpop csst_data_list_zxl)
#redis-cli -h 10.3.10.28 -p 26379 -a "csst__2025" rpop csst_data_list
echo
"msg : "
$msg
...
...
This diff is collapsed.
Click to expand it.
L1/dockerfiles/redis-cli/test.sh
View file @
7f892f4f
redis-cli
-h
10.3.10.28
-a
123456 lpush csst_data_list_zxl
"{
\"
dag_id
\"
:
\"
csst-msc-l1-mbi
\"
,
\"
parameters
\"
: {
\"
dag_run_id
\"
:
\"
202411111841239406
\"
,
\"
message
\"
: {
\"
obsid
\"
:
\"
11009101682009
\"
,
\"
chipid
\"
:
\"
16
\"
}}}"
\ No newline at end of file
redis-cli
-h
172.24.232.14
-a
123456 rpush csst_data_list
"{
\"
dag_id
\"
:
\"
csst-msc-l1-mbi
\"
,
\"
dag_run_id
\"
:
\"
202411111841239406
\"
,
\"
batch_id
\"
:
\"
msc-093-reduction-v2
\"
,
\"
message
\"
: {
\"
obsid
\"
:
\"
11009101682009
\"
,
\"
chipid
\"
:
\"
16
\"
,
\"
dataset
\"
:
\"
msc-093
\"
,
\"
batch_id
\"
:
\"
msc-093-reduction-v2
\"
}}"
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment