Merge pull request #26 from manics/fix-travis

Fix travis

Dockerfile

@@ -25,6 +25,10 @@ ADD 50-config.py 60-database.sh 99-run.sh /startup/
 
 USER omero-server
 
+# Fixed in 5.5.0 https://github.com/openmicroscopy/openmicroscopy/pull/5949
+RUN sed -i.bak -re \
+    's/(name="omero.fs.importArgs"\s+value=)""/\1"--no-upgrade-check"/' \
+    /opt/omero/server/OMERO.server/etc/templates/grid/templates.xml
 EXPOSE 4063 4064
 VOLUME ["/OMERO", "/opt/omero/server/OMERO.server/var"]
 

test_processor.sh

@@ -14,8 +14,10 @@ SCRIPT=/omero/util_scripts/Dataset_To_Plate.py
 
 dataset_id=$(docker exec $PREFIX-server $OMERO obj -q -s localhost -u $OMERO_USER -w $OMERO_PASS new Dataset name=$DSNAME | cut -d: -f2)
 
+# Fixed in 5.5.0 https://github.com/openmicroscopy/openmicroscopy/pull/5949
+BUGFIX_ARGS="--skip upgrade"
 docker exec $PREFIX-server sh -c \
-    "touch /tmp/$FILENAME && $OMERO import -d $dataset_id /tmp/$FILENAME"
+    "touch /tmp/$FILENAME && $OMERO import $BUGFIX_ARGS -d $dataset_id /tmp/$FILENAME"
 
 docker exec $PREFIX-server $OMERO script launch $SCRIPT IDs=$dataset_id
 echo "Completed with code $?"