8000 remove -it in docker option · cheoljoo/doxygen_perlmod_python@50702e9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 50702e9

Browse files
author
charles.lee
committed
remove -it in docker option
1 parent c2945c2 commit 50702e9

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎taf/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ endif
3030
/bin/bash taf_create_docker.sh >> doxygen_perlmod_python.log 2>&1
3131
echo "mkdir -p ${OUTDIR}"
3232
mkdir -p ${OUTDIR}
33-
docker run -it --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE="${MODULE}" doxygen_perlmod_python:latest bash /docker_git/taf_run_in_docker.sh
33+
docker run --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE="${MODULE}" doxygen_perlmod_python:latest bash /docker_git/taf_run_in_docker.sh
3434
echo "OUTPUT directory : ${newOUTDIR}"
3535
#if [ -e plantuml.md ]; then echo "parse_flowchart.py --inpuml=plantuml.md --outjson=plantuml.json"; python3 parse_flowchart.py --inpuml=plantuml.md --outjson=plantuml.json; fi
3636
#if [ -e plantuml.md ]; then echo "copy plantuml.md ${OUTDIR}"; cp -f plantuml.md ${OUTDIR} ; fi
37-
#if [ -e plantuml.json ]; then echo "taf_run_flowchart_in_docker.sh" ; mkdir -p ${OUTDIR}/flowchart; docker run -it --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}/flowchart`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE=${MODULE} doxygen_perlmod_python:latest bash /docker_git/taf_run_flowchart_in_docker.sh >> doxygen_perlmod_python.log 2>&1 ; fi
37+
#if [ -e plantuml.json ]; then echo "taf_run_flowchart_in_docker.sh" ; mkdir -p ${OUTDIR}/flowchart; docker run --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}/flowchart`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE=${MODULE} doxygen_perlmod_python:latest bash /docker_git/taf_run_flowchart_in_docker.sh >> doxygen_perlmod_python.log 2>&1 ; fi
3838
if [ -e doxygen_perlmod_python.log ]; then echo "copy doxygen_perlmod_python.log ${OUTDIR}"; cp -f doxygen_perlmod_python.log ${OUTDIR} ; fi

‎taf/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ endif
3333
/bin/bash taf_create_docker.sh >> doxygen_perlmod_python.log 2>&1
3434
echo "mkdir -p ${OUTDIR}"
3535
mkdir -p ${OUTDIR}
36-
docker run -it --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE="${MODULE}" doxygen_perlmod_python:latest bash /docker_git/taf_run_in_docker.sh
36+
docker run --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE="${MODULE}" doxygen_perlmod_python:latest bash /docker_git/taf_run_in_docker.sh
3737
echo "OUTPUT directory : ${newOUTDIR}"
3838
#if [ -e plantuml.md ]; then echo "parse_flowchart.py --inpuml=plantuml.md --outjson=plantuml.json"; python3 parse_flowchart.py --inpuml=plantuml.md --outjson=plantuml.json; fi
3939
#if [ -e plantuml.md ]; then echo "copy plantuml.md ${OUTDIR}"; cp -f plantuml.md ${OUTDIR} ; fi
40-
#if [ -e plantuml.json ]; then echo "taf_run_flowchart_in_docker.sh" ; mkdir -p ${OUTDIR}/flowchart; docker run -it --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}/flowchart`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE=${MODULE} doxygen_perlmod_python:latest bash /docker_git/taf_run_flowchart_in_docker.sh >> doxygen_perlmod_python.log 2>&1 ; fi
40+
#if [ -e plantuml.json ]; then echo "taf_run_flowchart_in_docker.sh" ; mkdir -p ${OUTDIR}/flowchart; docker run --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}/flowchart`:/docker_out -v `pwd`:/docker_git -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE=${MODULE} doxygen_perlmod_python:latest bash /docker_git/taf_run_flowchart_in_docker.sh >> doxygen_perlmod_python.log 2>&1 ; fi
4141
if [ -e doxygen_perlmod_python.log ]; then echo "copy doxygen_perlmod_python.log ${OUTDIR}"; cp -f doxygen_perlmod_python.log ${OUTDIR} ; fi
4242
```
4343
- Run with one service

‎taf/runParallel.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def work_func(x,outdir):
1717
cmd = '''cd {x}; make -f taf-doc.mk INDIR=_hpp_ OUTDIR={o}/{m} MODULE="{m}" '''.format(x=x,o=outdir,m=module)
1818
#print(cmd,flush=True)
1919
ret = subprocess.run(cmd,stdout=subprocess.PIPE , stderr=subprocess.PIPE, shell=True,text=True)
20-
os.system('stty sane')
21-
os.system('stty erase ^H')
20+
#os.system('stty sane') # if you remove -it in docker , you can keep your stty status
21+
#os.system('stty erase ^H') # if you remove -it in docker , you can keep your stty status
2222
print(cmd, ret.returncode)
2323
return ret.returncode , ret.stdout , ret.stderr
2424

@@ -196,8 +196,8 @@ def work_func(x,outdir):
196196
pool = Pool(num_cores)
197197
partial_func = partial(work_func,outdir=args.outReportDir)
198198
rt = pool.map(partial_func, doc_target)
199-
os.system('stty sane')
200-
os.system('stty erase ^H')
199+
#os.system('stty sane') # if you remove -it in docker , you can keep your stty status
200+
#os.system('stty erase ^H') # if you remove -it in docker , you can keep your stty status
201201
cnt = 0
202202
for r,ro,re in rt:
203203
if r:

‎taf/taf-doc.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ endif
2424
-perl ../doxy2py.pl
2525
-echo "mkdir -p ${OUTDIR}"
2626
-mkdir -p ${OUTDIR}
27-
echo "docker run -it --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`/..:/docker_git -v `pwd`:/docker_now -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE=${MODULE} doxygen_perlmod_python:latest bash /docker_git/taf-doc_run_in_docker.sh"
28-
docker run -it --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`/..:/docker_git -v `pwd`:/docker_now -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE="${MODULE}" doxygen_perlmod_python:latest bash /docker_git/taf-doc_run_in_docker.sh
27+
echo "docker run --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`/..:/docker_git -v `pwd`:/docker_now -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE=${MODULE} doxygen_perlmod_python:latest bash /docker_git/taf-doc_run_in_docker.sh"
28+
docker run --rm --user `id -u`:`id -g` -v `pwd`/_hpp_:/docker_in -v `realpath ${OUTDIR}`:/docker_out -v `pwd`/..:/docker_git -v `pwd`:/docker_now -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_git -e DOCKER_MODULE="${MODULE}" doxygen_perlmod_python:latest bash /docker_git/taf-doc_run_in_docker.sh
2929
echo "OUTPUT directory : ${newOUTDIR}"
3030
if [ -e doxygen_perlmod_python.log ]; then echo "copy doxygen_perlmod_python.log ${OUTDIR}"; cp -f doxygen_perlmod_python.log ${OUTDIR} ; fi
3131
if [ -e DoxyDocs.py ]; then echo "copy DoxyDocs.py ${OUTDIR}"; cp -f DoxyDocs.py ${OUTDIR} ; fi

‎taf/taf-doc_run_in_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# docker image (doxygen_perlmod_python:latest) is created from docker image(vaeum/alpine-python3-pip3) with taf_install.sh
2-
# docker run -it --user `id -u`:`id -g` -v `pwd`:/docker_in -v `pwd`/op:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_in doxygen_perlmod_python:latest bash /docker_in/taf_run.sh
2+
# docker run --user `id -u`:`id -g` -v `pwd`:/docker_in -v `pwd`/op:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_in doxygen_perlmod_python:latest bash /docker_in/taf_run.sh
33
umask 000
44
chmod 777 -R ${DOCKER_OUT}
55
echo "DOCKER_IN ${DOCKER_IN}"

‎taf/taf_create_docker.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# docker run -it -v `pwd`:/docker_in -v `pwd`:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out vaeum/alpine-python3-pip3 bash /docker_in/taf_install.sh
1+
# docker run -v `pwd`:/docker_in -v `pwd`:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out vaeum/alpine-python3-pip3 bash /docker_in/taf_install.sh
22
image_exists=$(docker images | grep "doxygen_perlmod_python")
33

44
if [[ -z "$image_exists" ]]; then
55
echo "taf_create_docker.sh: not exist doxygen_perlmod_python image"
6-
docker run -it --name base_of_python3_and_pip3 -v `pwd`:/docker_in -v `pwd`:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out vaeum/alpine-python3-pip3 bash /docker_in/taf_install_in_docker.sh
6+
docker run --name base_of_python3_and_pip3 -v `pwd`:/docker_in -v `pwd`:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out vaeum/alpine-python3-pip3 bash /docker_in/taf_install_in_docker.sh
77
docker commit base_of_python3_and_pip3 doxygen_perlmod_python:latest
88
else
99
echo "taf_create_docker.sh: exist doxygen_perlmod_python image"
@@ -19,4 +19,4 @@ else
1919
fi
2020

2121
# docker iamge (doxygen_perlmod_python:latest) is created from docker image(vaeum/alpine-python3-pip3) with taf_install.sh
22-
# docker run -it --user `id -u`:`id -g` -v `pwd`:/docker_in -v `pwd`/op:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_in doxygen_perlmod_python:latest bash /docker_in/taf_run.sh
22+
# docker run --user `id -u`:`id -g` -v `pwd`:/docker_in -v `pwd`/op:/docker_out -e DOCKER_IN=/docker_in -e DOCKER_OUT=/docker_out -e DOCKER_GIT=/docker_in doxygen_perlmod_python:latest bash /docker_in/taf_run.sh

0 commit comments

Comments
 (0)
0