File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -24,6 +24,5 @@ RUN python${py_N} repo/docker_build/iinit.py \
2424 password rods
2525SHELL ["/bin/bash","-c"]
2626CMD echo "Waiting on iRODS server... " ; \
27- python${PY_N} repo/docker_build/recv_oneshot -h irods-provider -p 8888 -t 360 && \
2827 sudo groupadd -o -g $(stat -c%g /irods_shared) irods && sudo usermod -aG irods user && \
2928 newgrp irods < repo/run_python_tests.sh
Original file line number Diff line number Diff line change @@ -31,6 +31,5 @@ SHELL ["/bin/bash","-c"]
3131# 3. run python tests as the new group
3232
3333CMD echo "Waiting on iRODS server... " ; \
34- python${PY_N} repo/docker_build/recv_oneshot -h irods-provider -p 8888 -t 360 && \
3534 sudo groupadd -o -g $(stat -c%g /irods_shared) irods && sudo usermod -aG irods user && \
3635 newgrp irods < repo/run_python_tests.sh
Original file line number Diff line number Diff line change @@ -44,17 +44,17 @@ chown -R irods:irods /irods_shared
4444
4545echo " Starting server"
4646
47- # After successful launch of server (per ils success), signal the client container we are ready
48- {
49- # wait until server is up
50- while : ; do
51- su - irods -c ils > /dev/null 2>&1 && break
52- # echo "** waiting on server before send_oneshot" |tee -a /tmp/debug.dan
53- sleep 1
54- done
55- echo " **** got this far - about to execute send_oneshot" | tee -a /tmp/debug.dan
56- env PORT=8888 " $( dirname " $0 " ) " /send_oneshot
57- } &
47+ # # After successful launch of server (per ils success), signal the client container we are ready
48+ # {
49+ # # wait until server is up
50+ # while :; do
51+ # su - irods -c ils >/dev/null 2>&1 && break
52+ # #echo "** waiting on server before send_oneshot" |tee -a /tmp/debug.dan
53+ # sleep 1
54+ # done
55+ # echo "**** got this far - about to execute send_oneshot" |tee -a /tmp/debug.dan
56+ # env PORT=8888 "$(dirname "$0")"/send_oneshot
57+ # } &
5858
5959cd /usr/sbin
6060su irods -c ' bash -c "./irodsServer -u"'
Original file line number Diff line number Diff line change @@ -45,17 +45,17 @@ chmod 0777 /irods_shared
4545
4646echo " Starting server"
4747
48- # After successful launch of server (per ils success), signal the client container we are ready
49- {
50- # wait until server is up
51- while : ; do
52- su - irods -c ils > /dev/null 2>&1 && break
53- # echo "** waiting on server before send_oneshot" |tee -a /tmp/debug.dan
54- sleep 1
55- done
56- echo " **** got this far - about to execute send_oneshot" | tee -a /tmp/debug.dan
57- env PORT=8888 " $( dirname " $0 " ) " /send_oneshot
58- } &
48+ # # After successful launch of server (per ils success), signal the client container we are ready
49+ # {
50+ # # wait until server is up
51+ # while :; do
52+ # su - irods -c ils >/dev/null 2>&1 && break
53+ # #echo "** waiting on server before send_oneshot" |tee -a /tmp/debug.dan
54+ # sleep 1
55+ # done
56+ # echo "**** got this far - about to execute send_oneshot" |tee -a /tmp/debug.dan
57+ # env PORT=8888 "$(dirname "$0")"/send_oneshot
58+ # } &
5959
6060cd /usr/sbin
6161# irods 4
You can’t perform that action at this time.
0 commit comments