Merge pull request #16 from mattsouth/version-nudges

version nudge for tomcat and xnat and small tidy ups in the tomcat service Dockerfile

Author: johnflavin

README.md

@@ -34,7 +34,7 @@ This repository contains files to bootstrap XNAT deployment. The build creates f
 3. Download [latest XNAT WAR](https://bintray.com/nrgxnat/applications/XNAT/_latestVersion)
 
 ```
-wget --quiet --no-cookies https://bintray.com/nrgxnat/applications/download_file?file_path=xnat-web-1.7.4.war -O webapps/xnat.war
+wget --quiet --no-cookies https://bintray.com/nrgxnat/applications/download_file?file_path=xnat-web-1.7.4.1.war -O webapps/xnat.war
 ```
 
 4. Start the system
@@ -48,7 +48,7 @@ Note that at this point, if you go to `localhost/xnat` you won't see a working w
 to initialize the database, and you can follow progress by reading the docker compose log of the server:
 
 ```
-docker-compose logs -f --tail=20 xnat-web 
+docker-compose logs -f --tail=20 xnat-web
 Attaching to xnatdockercompose_xnat-web_1
 xnat-web_1    | INFO: Starting Servlet Engine: Apache Tomcat/7.0.82
 xnat-web_1    | Oct 24, 2017 3:17:02 PM org.apache.catalina.startup.HostConfig deployWAR
@@ -126,7 +126,7 @@ docker exec -it $NAME cat /opt/tomcat/logs/catalina.2017-10-24.log
 Bring all the instances down (this will bring down all container and remove all the images) by running
 
 ```
-docker-compose down --rmi all 
+docker-compose down --rmi all
 ```
 
 #### Bring up instances
@@ -150,4 +150,3 @@ docker-compose up -d
 
 
      Click on any subcontainer to view its metrics
-

tomcat/Dockerfile

@@ -4,8 +4,6 @@ MAINTAINER Manish Kumar <rishimanish123@gmail.com>
 
 ARG LOCALE
 
-ENV TOMCAT_VERSION 7.0.79
-
 RUN apt-get -qq update && \
     apt-get -q -y upgrade && \
     apt-get install -y sudo curl wget locales
@@ -20,7 +18,7 @@ ENV LC_ALL $LOCALE.UTF-8
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.82
+ENV TOMCAT_VERSION 7.0.85
 # Get Tomcat
 ENV TOMCAT_TGZ_URLS \
     https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
@@ -73,11 +71,5 @@ VOLUME "/opt/tomcat/webapps"
 ADD setenv.sh /opt/tomcat/bin
 WORKDIR /opt/tomcat
 
-
-#RUN wget --quiet --no-cookies https://bintray.com/nrgxnat/applications/download_file?file_path=xnat-web-1.7.0.war -O /opt/tomcat/xnat-web-1.7.0.war
-
 # Launch Tomcat
 CMD ["/opt/tomcat/bin/catalina.sh", "run"]
-
-#move xnat war to webapps
-#RUN mv /opt/tomcat/xnat-web-1.7.0.war /opt/tomcat/webapps