Updated to vlo-3.4-beta2, depend on tomcat8 v1.1.5 and bumped version

Dockerfile

@@ -1,10 +1,10 @@
-FROM docker.clarin.eu/tomcat8:1.1.2
+FROM docker.clarin.eu/tomcat8:1.1.5
 
 ENV JAVA_OPTS="-Dwicket.configuration=deployment -Dsolr.data.dir=/opt/solr-data"
 
 RUN mkdir -p /opt/solr-data
 RUN rm -r /var/lib/tomcat8/webapps/ROOT
-COPY webapp/vlo-3.4-beta1/ /opt/vlo
+COPY webapp/vlo-3.4-beta2/ /opt/vlo
 COPY webapp/vlo-context.xml /etc/tomcat8/Catalina/localhost/ROOT.xml
 COPY webapp/solr-context.xml /etc/tomcat8/Catalina/localhost/solr.xml
 COPY importer.sh /opt/importer.sh

Makefile

@@ -2,10 +2,10 @@ build:
 	@sh cleanup.sh
 	@sh prepare.sh
 	@echo "Building docker image"
-	@docker build -t docker.clarin.eu/vlo-beta:3.4-beta1 . >> docker_build.log 2>&1
+	@docker build -t docker.clarin.eu/vlo-beta:1.0.1 . >> docker_build.log 2>&1
 	@sh cleanup.sh
 
 push:
-	docker push docker.clarin.eu/vlo-beta:3.4-beta1
+	docker push docker.clarin.eu/vlo-beta:1.0.1
 
 all: build

cleanup.sh

@@ -2,7 +2,7 @@
 
 echo "Cleaning up"
 
-if [ -d "webapp/vlo-3.4-beta1" ]; then
-	echo "\tRemoving webapp/vlo-3.4-beta1*"
-	rm -r webapp/vlo-3.4-beta1*
+if [ -d "webapp/vlo-3.4-beta2" ]; then
+	echo "\tRemoving webapp/vlo-3.4-beta2*"
+	rm -r webapp/vlo-3.4-beta2*
 fi

prepare.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-ARCHIVE_WEBAPP="https://clarin.fz-juelich.de/owncloud/public.php?service=files&t=c5e63c5d1eea6ffbc274d2a94d853f2d&download"
-NAME="vlo-3.4-beta1"
+ARCHIVE_WEBAPP="https://clarin.fz-juelich.de/owncloud/public.php?service=files&t=c74d48d9a15aa1a7dfc456718edb9b83&download"
+NAME="vlo-3.4-beta2"
 
 echo "Downloading external resources"