Commit 2b40621f authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Fixinf build problems

parent 35665ff7

auth/Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ RUN cd $ESGF_AUTH_INSTALL_DIR && \ 
    cd crypto-cookie && \

    python setup.py install



# copy mock configuration file which is read by settings.py during the database creation

COPY conf/esgf_auth_config.json /esg/config/esgf_auth_config.json



# install esgf-auth

RUN cd $ESGF_AUTH_INSTALL_DIR && \

    source venv/bin/activate && \
@@ -39,9 +42,6 @@ RUN cd $ESGF_AUTH_INSTALL_DIR && \ 
    pip install -r requirements.txt && \

    python ./manage.py migrate



# FIXME: override settings.py to read external configuration

COPY conf/settings.py /usr/local/esgf-auth/src/esgf-auth/esgf_auth/settings.py



# 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

auth/conf/esgf_auth_config.json

0 → 100644
+5 −0
Original line number Diff line number Diff line 
{

"ESGF_HOSTNAME":"localhost",

"ESGF_SECRET_KEY":"A7JiFckYWpqezusdOfJoH[==",

"DJANGO_SECRET_KEY":"5_7$jn1-c8h5@(e$x8fhk=&!mk=ea6=irwm+b22nu)h=rhox46"

}

cog/Dockerfile

+4 −3
Original line number Diff line number Diff line
@@ -105,9 +105,10 @@ VOLUME $COG_INSTALL_DIR 
# startup

COPY  scripts/ /usr/local/bin/

COPY  conf/supervisord.cog.conf /etc/supervisor/conf.d/supervisord.cog.conf

#COPY  scripts/wait_for_postgres.sh /usr/local/bin/wait_for_postgres.sh

#COPY  scripts/process_esgf_config_archive.sh /usr/local/bin/process_esgf_config_archive.sh



# wait for Postgred connection to be ready

COPY scripts/wait_for_postgres.sh /usr/local/bin/wait_for_postgres.sh

COPY scripts/process_esgf_config_archive.sh /usr/local/bin/process_esgf_config_archive.sh

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

# will override these CMD options at run time

CMD ["localhost", "false", "true"]

data-node/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ COPY thredds/conf/log4j2.xml /usr/local/tomcat/webapps/thredds/WEB-INF/classes/l 


# data node scripts

COPY scripts/ /usr/local/bin/

#COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

#COPY scripts/process_esgf_config_archive.sh /usr/local/bin/process_esgf_config_archive.sh



# TDS test ESGF catalogs

# COPY esgf-content/thredds/ /esg/content/thredds/
@@ -213,6 +215,4 @@ RUN mkdir -p $DASHBOARD_HOME/logs 


#===========================================



COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

COPY scripts/process_esgf_config_archive.sh /usr/local/bin/process_esgf_config_archive.sh

ENTRYPOINT /usr/local/bin/docker-entrypoint.sh