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

Cleaning up devel images

parent 5a1fb396

data-node/Dockerfile

+3 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# o ORP

# o Dashboard



FROM esgfhub/esgf-tomcat:1.2

FROM esgfhub/esgf-tomcat:devel



MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
@@ -201,4 +201,5 @@ RUN mkdir -p $DASHBOARD_HOME/logs 


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



# startup configuration and entry-point inherited from esgf-tomcat image
 
# startup configuration inherited from esgf-tomcat image

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

docker-compose.yml

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ services: 
      - "8983"

      - "8984"

    ports:

      - "8985:8983"

      - "8986:8984" 

      - "8983:8983"

      - "8984:8984" 

    volumes:

      - solr_data:/esg/solr-index

    volumes_from:

index-node/Dockerfile

+3 −2
Original line number Diff line number Diff line 
# ESGF index node:  esgf-search application running inside Tomcat



FROM esgfhub/esgf-tomcat:1.2

FROM esgfhub/esgf-tomcat:devel



MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
@@ -14,4 +14,5 @@ RUN cd /usr/local/tomcat/webapps/esg-search/ && \ 
    rm esg-search.war && \

    chown -R tomcat:tomcat /usr/local/tomcat/webapps/esg-search



# index node startup inherited from esgf-tomcat image
 
# index node startup configuration inherited from esgf-tomcat image

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

solr/Dockerfile

+1 −1
Original line number Diff line number Diff line 
# ESGF node with Solr engine configured to serve ESGF shards



FROM esgfhub/esgf-node:1.2

FROM esgfhub/esgf-node:devel



MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>