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
fb9004f3
"L1/dockerfiles/adm-L1/Dockerfile" did not exist on "589d089426b5f4a811a1ef7e471b8deefb39c2bc"
Commit
fb9004f3
authored
Aug 11, 2023
by
Zhang Xiaoli
Browse files
update version base image:0.9
parent
e8e9440e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
10 deletions
+14
-10
L1/dockerfiles/csst-msc-l1-sls1d/adm/Dockerfile
L1/dockerfiles/csst-msc-l1-sls1d/adm/Dockerfile
+1
-1
L1/dockerfiles/csst-msc-l1-sls1d/exe/Dockerfile
L1/dockerfiles/csst-msc-l1-sls1d/exe/Dockerfile
+1
-1
L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile
L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile
+2
-2
L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml
L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml
+10
-6
No files found.
L1/dockerfiles/csst-msc-l1-sls1d/adm/Dockerfile
View file @
fb9004f3
...
@@ -4,7 +4,7 @@ USER root
...
@@ -4,7 +4,7 @@ USER root
COPY
run.sh /app/bin/
COPY
run.sh /app/bin/
RUN
chmod
+x /app/bin/run.sh
RUN
chmod
+x /app/bin/run.sh
COPY
--from=hub.cstcloud.cn/scalebox/base /usr/local/sbin/ /usr/local/sbin/
COPY
--from=hub.cstcloud.cn/scalebox/base
:0.9
/usr/local/sbin/ /usr/local/sbin/
RUN
mkdir
-p
/work
&&
echo
"PATH=/app/bin:
\$
{PATH}"
>>
/root/.bashrc
RUN
mkdir
-p
/work
&&
echo
"PATH=/app/bin:
\$
{PATH}"
>>
/root/.bashrc
# RUN mkdir -p /work /app/bin && echo "PATH=/app/bin:\${PATH}" >> /root/.bashrc
# RUN mkdir -p /work /app/bin && echo "PATH=/app/bin:\${PATH}" >> /root/.bashrc
WORKDIR
/work
WORKDIR
/work
...
...
L1/dockerfiles/csst-msc-l1-sls1d/exe/Dockerfile
View file @
fb9004f3
...
@@ -4,7 +4,7 @@ USER root
...
@@ -4,7 +4,7 @@ USER root
COPY
run.sh /app/bin/
COPY
run.sh /app/bin/
RUN
chmod
+x /app/bin/run.sh
RUN
chmod
+x /app/bin/run.sh
COPY
--from=hub.cstcloud.cn/scalebox/base /usr/local/sbin/ /usr/local/sbin/
COPY
--from=hub.cstcloud.cn/scalebox/base
:0.9
/usr/local/sbin/ /usr/local/sbin/
RUN
mkdir
-p
/work
&&
echo
"PATH=/app/bin:
\$
{PATH}"
>>
/root/.bashrc
RUN
mkdir
-p
/work
&&
echo
"PATH=/app/bin:
\$
{PATH}"
>>
/root/.bashrc
WORKDIR
/work
WORKDIR
/work
...
...
L1/dockerfiles/csst-msc-l1-sls1d/test/Makefile
View file @
fb9004f3
...
@@ -3,7 +3,7 @@ CLUSTER=csst
...
@@ -3,7 +3,7 @@ CLUSTER=csst
all
:
reset build
all
:
reset build
run
:
run
:
scalebox app create
--env-file
zjs
-ztm
.env
scalebox app create
--env-file
zjs.env
reset
:
reset
:
cd
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
&&
make
&&
cd
-
cd
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
&&
make
&&
cd
-
...
@@ -15,4 +15,4 @@ list:
...
@@ -15,4 +15,4 @@ list:
make
-C
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
list
make
-C
${HOME}
/docker-scalebox/clusters/
$(CLUSTER)
list
scp
:
scp
:
scp
-r
../ csst-zjs:/root/csst/csst-msc-l2-xcat/
scp
-r
../ csst-zjs:/root/csst/csst-msc-l1-sls1d/
\ No newline at end of file
\ No newline at end of file
L1/dockerfiles/csst-msc-l1-sls1d/test/app.yaml
View file @
fb9004f3
...
@@ -10,7 +10,7 @@ jobs:
...
@@ -10,7 +10,7 @@ jobs:
csst-msc-l1-sls1d-adm
:
csst-msc-l1-sls1d-adm
:
label
:
无缝光谱1D管理模块
label
:
无缝光谱1D管理模块
base_image
:
cnic/csst-msc-l1-sls1d-adm:latest
base_image
:
cnic/csst-msc-l1-sls1d-adm:latest
schedule_mode
:
HEAD
#
schedule_mode: HEAD
variables
:
variables
:
# always_running: yes
# always_running: yes
output_text_size
:
100000
output_text_size
:
100000
...
@@ -34,13 +34,17 @@ jobs:
...
@@ -34,13 +34,17 @@ jobs:
-
csst-msc-l1-sls1d-exe
-
csst-msc-l1-sls1d-exe
# command: >
# command: >
# bash -c "python /pipeline/src/run.py && echo '---' && cat /pipeline/output/msg.txt"
# bash -c "python /pipeline/src/run.py && echo '---' && cat /pipeline/output/msg.txt"
hosts
:
# - h0:1
# - c0:1
# - c1:1
-
c2:1
csst-msc-l1-sls1d-exe
:
csst-msc-l1-sls1d-exe
:
label
:
无缝光谱1D执行模块
label
:
无缝光谱1D执行模块
base_image
:
cnic/csst-msc-l1-sls1d-exe:latest
base_image
:
cnic/csst-msc-l1-sls1d-exe:latest
schedule_mode
:
HEAD
#
schedule_mode: HEAD
variables
:
variables
:
always_running
:
yes
#
always_running: yes
output_text_size
:
100000
output_text_size
:
100000
# DFS入库错误重试3次
# DFS入库错误重试3次
retry_rules
:
"
['202:3']"
retry_rules
:
"
['202:3']"
...
@@ -59,8 +63,8 @@ jobs:
...
@@ -59,8 +63,8 @@ jobs:
-
${CSST_CRDS_ROOT}:/crdsroot
-
${CSST_CRDS_ROOT}:/crdsroot
# command: >
# command: >
# python /pipeline/src/run.py {\"brick_id\":1}
# python /pipeline/src/run.py {\"brick_id\":1}
#
hosts:
hosts
:
# - h0:1
# - h0:1
# - c0:1
# - c0:1
# - c1:1
# - c1:1
# - c2:1
-
c2:2
\ No newline at end of file
\ No newline at end of file
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