Merge pull request #122 from HSF/dev

add which
HSF · Oct 27, 2022 · c651ac0 · c651ac0
2 parents 6e9e538 + 64a20e2
commit c651ac0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -28,7 +28,7 @@ RUN yum upgrade -y && \
 # RUN yum install -y httpd.x86_64 conda gridsite mod_ssl.x86_64 httpd-devel.x86_64 gcc.x86_64 supervisor.noarch fetch-crl.noarch lcg-CA postgresql postgresql-contrib postgresql-static postgresql-libs postgresql-devel && \
 #     yum clean all && \
 #     rm -rf /var/cache/yum
-RUN yum install -y httpd.x86_64 conda gridsite mod_ssl.x86_64 httpd-devel.x86_64 gcc.x86_64 supervisor.noarch fetch-crl.noarch lcg-CA redis && \
+RUN yum install -y httpd.x86_64 which conda gridsite mod_ssl.x86_64 httpd-devel.x86_64 gcc.x86_64 supervisor.noarch fetch-crl.noarch lcg-CA redis && \
 yum clean all && \
 rm -rf /var/cache/yum
 

diff --git a/main/config_default/supervisord_idds.ini b/main/config_default/supervisord_idds.ini
@@ -5,7 +5,8 @@ environment =
     RUCIO_AUTH_TYPE=x509_proxy,
     X509_USER_PROXY=/opt/idds/config/x509up
 ;command=/opt/idds/bin/run-idds
-command=bash -c "source /etc/profile.d/conda.sh && conda activate /opt/idds && /opt/idds/bin/run-idds"
+;command=bash -c "source /etc/profile.d/conda.sh && conda activate /opt/idds && /opt/idds/bin/run-idds"
+command=bash -c "trap 'kill -TERM $PID; wait $PID' TERM && source /etc/profile.d/conda.sh && conda activate /opt/idds && /opt/idds/bin/run-idds && PID=$! && wait $PID"
 process_name=%(process_num)02d
 # user=atlpan
 childlogdir=/var/log/idds