Add dependency on tomcat for database container

Author: mcritchlow

Dockerfile

@@ -1,8 +1,22 @@
-FROM circleci/ruby:2.3.7-node-browsers
+FROM ruby:2.3.7
 
 # Maintainer
 MAINTAINER "Matt Critchlow <[email protected]">
 
+RUN apt-get update -yqq \
+ && apt-get install -yqq --no-install-recommends nodejs libicu-dev libfontconfig1-dev libjpeg-dev libfreetype6 \
+ && apt-get clean
+
+ENV PHANTOM_JS_TAG 2.1.1
+
+# Downloading bin, unzipping & removing zip
+WORKDIR /tmp
+RUN wget -q http://cnpmjs.org/mirrors/phantomjs/phantomjs-${PHANTOM_JS_TAG}-linux-x86_64.tar.bz2 -O phantomjs.tar.bz2 \
+  && tar xjf phantomjs.tar.bz2 \
+  && rm -rf phantomjs.tar.bz2 \
+  && mv phantomjs-* phantomjs \
+  && mv /tmp/phantomjs/bin/phantomjs /usr/local/bin/phantomjs
+
 RUN echo "phantomjs binary is located at `which phantomjs`" \
   && echo "just run 'phantomjs' (version `phantomjs -v`)"
 

docker-compose.yml

@@ -9,6 +9,7 @@ services:
       - ./:/usr/src/app
     depends_on:
       - database
+      - tomcat
     env_file:
       - docker/.env.dev.database
       - docker/.env.dev.web
@@ -22,6 +23,9 @@ services:
 
   tomcat:
     image: ucsdlib/docker-tomcat-damsrepo
+    # command: ["dockerize", "-wait", "tcp://database:5432", "-timeout", "1m", "catalina.sh", "run"]
+    depends_on:
+      - database
 
 # volumes:
 #   db-data: