Commit d8bae838 authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Changing how Tomcat is started in the IdP.

parent 65a4bea5

esgf_config/esg/config/esgf_search_aliases.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- This file contains a list of aliases for ESGF search facets. -->

<aliases xmlns="http://www.esgf.org/whitelist">



    <set>

       <value>project</value>

       <value>model_cohort</value>

    </set>



    <set>

       <value>project</value>

       <value>model_cohort</value>

    </set>



    <set>

       <value>activity</value>

       <value>experiment_family</value>

    </set>



</aliases>

idp-node/Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ RUN cd /usr/local/tomcat/webapps/esgf-idp/ && \ 


# run Tomcat as non-privileged user

USER tomcat

ENTRYPOINT ["/usr/local/tomcat/bin/catalina.sh", "run"]
 
COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

#ENTRYPOINT ["/usr/local/tomcat/bin/catalina.sh", "run"]

idp-node/scripts/docker-entrypoint.sh

0 → 100755
+6 −0
Original line number Diff line number Diff line 
#!/bin/sh

# script that starts Tomcat then keeps the container running

#

/usr/local/tomcat/bin/catalina.sh start

#

tail -f /dev/null