Commit d9ea96f5 authored by Sebastien Gardoll's avatar Sebastien Gardoll
Browse files

merge int_1.4 into dev_1.4_sg + urandom

parents b4c160a9 61c5aa94

auth/Dockerfile

0 → 100644
+49 −0
Original line number Diff line number Diff line 
# ESGF-Auth client application.



ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel

ARG ESGF_REPO=http://distrib-coffee.ipsl.jussieu.fr/pub/esgf



FROM $ESGF_IMAGES_HUB/esgf-node:$ESGF_VERSION



MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>



# installation directory

ENV ESGF_AUTH_INSTALL_DIR=/usr/local/esgf-auth



# library dependencies

RUN yum -y update; yum -y install libffi-devel; yum clean all



# create python virtual environment

RUN mkdir -p $ESGF_AUTH_INSTALL_DIR && \

    cd $ESGF_AUTH_INSTALL_DIR && \

    virtualenv venv



# install source code

RUN mkdir -p $ESGF_AUTH_INSTALL_DIR/src



# install crypto cookie

RUN cd $ESGF_AUTH_INSTALL_DIR && \

    source venv/bin/activate && \

    cd src && \

    git clone https://github.com/philipkershaw/crypto-cookie.git && \

    cd crypto-cookie && \

    python setup.py install



# install esgf-auth

RUN cd $ESGF_AUTH_INSTALL_DIR && \

    source venv/bin/activate && \

    cd src && \

    git clone https://github.com/lukaszlacinski/esgf-auth.git && \

    cd esgf-auth && \

    pip install -r requirements.txt && \

    pip install paste && \

    python ./manage.py migrate



# change permission on parent directory and database file so user apache can write

RUN chmod a+w /usr/local/esgf-auth/src/esgf-auth && \

    chmod a+w /usr/local/esgf-auth/src/esgf-auth/db.sqlite3



VOLUME /usr/local/esgf-auth



CMD ["supervisord", "--nodaemon", "-c", "/etc/supervisord.conf"]

auth/conf/supervisord.esgf-auth.conf

0 → 100644
+7 −0
Original line number Diff line number Diff line 
[program:esgf-auth]

command=bash -c 'source "/usr/local/esgf-auth/venv/bin/activate" && cd "/usr/local/esgf-auth/src/esgf-auth" && exec python ./manage.py runserver 0.0.0.0:8001'

stopsignal=KILL

killasgroup=true

stdout_logfile=/tmp/esgf-auth.log

stdout_logfile_maxbytes=0

redirect_stderr=true

data-node/Dockerfile

+5 −2
Original line number Diff line number Diff line
@@ -115,7 +115,9 @@ COPY thredds/conf/applicationContext.xml /usr/local/tomcat/webapps/thredds/WEB-I 
ADD $ESGF_REPO/dist/filters/XSGroupRole-1.0.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/XSGroupRole-1.0.0.jar

ADD $ESGF_REPO/dist/filters/commons-httpclient-3.1.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-httpclient-3.1.jar

ADD $ESGF_REPO/dist/filters/commons-lang-2.6.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-lang-2.6.jar

ADD $ESGF_REPO/dist/esg-orp/esg-orp-2.9.3.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esg-orp-2.9.6.jar

# FIXME

#ADD $ESGF_REPO/dist/esg-orp/esg-orp-2.9.3.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esg-orp-2.9.3.jar

COPY esgf-orp/esg-orp-2.9.6.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esg-orp-2.9.6.jar

ADD $ESGF_REPO/dist/esgf-node-manager/esgf-node-manager-common-1.0.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esgf-node-manager-common-1.0.0.jar

ADD $ESGF_REPO/dist/esgf-node-manager/esgf-node-manager-filters-1.0.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esgf-node-manager-filters-1.0.0.jar

ADD $ESGF_REPO/dist/esgf-security/esgf-security-2.7.10.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esgf-security-2.7.15.jar
@@ -179,7 +181,8 @@ RUN yum install -y curl-devel \ 
                   GeoIP-devel



# install additional GeoLiteCity database

COPY dashboard/GeoLiteCity.dat.gz /tmp

#COPY dashboard/GeoLiteCity.dat.gz /tmp

ADD $ESGF_REPO/dist/geoip/GeoLiteCity.dat.gz /tmp/GeoLiteCity.dat.gz

RUN mkdir -p /usr/local/geoip/share/GeoIP && \

     cd /tmp && \

     gunzip -c GeoLiteCity.dat.gz > /usr/local/geoip/share/GeoIP/GeoLiteCity.dat

data-node/dashboard/scripts/dashboard_ipservice.sh

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ git clone https://github.com/ESGF/esgf-dashboard.git 


cd esgf-dashboard/



git checkout -b work_plana origin/work_plana

git checkout -b devel origin/devel



cd src/c/esgf-dashboard-ip

data-node/esgf-orp/esg-orp-2.9.6.jar

0 → 100644
+73.9 KiB

File added.

No diff preview for this file type.

View file