Merge pull request #2 from I-TECH-UW/pmanko-fix-build

Fix docker build

Dockerfile

@@ -3,43 +3,7 @@
 #
 #
 
-FROM uwitech/ohie-base
-
-
-# Install dependencies
-RUN apt-get update && \
-apt-get install -y software-properties-common
-RUN add-apt-repository ppa:openjdk-r/ppa && \
-apt-get update && \
-apt-get install -y git build-essential curl wget software-properties-common openjdk-7-jre mysql-client
-
-# Install Tomcat
-ENV CATALINA_HOME /usr/local/tomcat
-ENV PATH $CATALINA_HOME/bin:$PATH
-RUN mkdir -p "$CATALINA_HOME" && \
-  mkdir /var/log/xdslog && \
-  chmod 777 /var/log/xdslog
-
-WORKDIR $CATALINA_HOME
-
-ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
-RUN set -ex; \
-	for key in $GPG_KEYS; do \
-		gpg --keyserver hkp://ha.pool.sks-keyservers.net --recv-keys "$key" || gpg --keyserver hkp://pgp.mit.edu --recv-keys "$key"; \
-	done
-
-ENV TOMCATVER 7.0.73
-
-ENV TOMCAT_TGZ_URL http://archive.apache.org/dist/tomcat/tomcat-7/v${TOMCATVER}/bin/apache-tomcat-${TOMCATVER}.tar.gz
-
-RUN set -x \
-    && curl -fSL "$TOMCAT_TGZ_URL" -o tomcat7.tar.gz \
-    && curl -fSL "$TOMCAT_TGZ_URL.asc" -o tomcat7.tar.gz.asc \
-    && gpg --verify tomcat7.tar.gz.asc \
-    && tar -xvf tomcat7.tar.gz --strip-components=1 \
-    && rm bin/*.bat \
-    && rm tomcat7.tar.gz*
-
+FROM tomcat:8.5-jdk8-adoptopenjdk-hotspot
 
 # Install dockerize
 ENV DOCKERIZE_VERSION v0.2.0
@@ -72,9 +36,7 @@ ADD modules/openhie-client-0.1-SNAPSHOT.omod ${TEMP_MODULES}/openhie-client-0.1-
 ADD modules/exportccd-1.0.0-SNAPSHOT.omod ${TEMP_MODULES}/exportccd-1.0.0-SNAPSHOT.omod
 
 # Load DATABASE script file
-RUN curl -L "https://s3.amazonaws.com/openshr/openmrs.sql.gz" \
-         -o openmrs.sql.gz \
-    && gunzip openmrs.sql.gz
+ADD openmrs.sql openmrs.sql
 
 ADD openshr-configuration.sql openshr-configuration.sql
 COPY concepts.sql shrdata.sql* /usr/local/tomcat/