Merge branch 'Version2' into 'master'

Version2

See merge request !3

assets/scripts/startup-fts-server.sh

@@ -8,4 +8,8 @@ cp /certs/hostcert.pem /etc/grid-security/hostcert.pem
 cp /certs/hostkey.pem /etc/grid-security/hostkey.pem
 cp /scripts/etc/hosts /etc/hosts
 
+if ! rpm -qa | grep x509-scitokens-issuer-client-0.7.0-1.hcc.el7.x86_64; \
+   then yum localinstall -y /scripts/x509-scitokens-issuer-client-0.7.0-1.hcc.el7.x86_64.rpm; \
+fi
+
 /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

docker-compose.yml

@@ -47,7 +47,6 @@ services:
       - ftsdb
     entrypoint:  
       - /scripts/startup-fts-server.sh
-      - if ! rpm -qa | grep x509-scitokens-issuer-client-0.7.0-1.hcc.el7.x86_64; then yum localinstall -y /scripts/x509-scitokens-issuer-client-0.7.0-1.hcc.el7.x86_64.rpm; fi
 
   fts-rest:
     env_file: