Merge pull request ome#37 from joshmoore/5_6_0_m4

Bump to 5.6.0-m4

Dockerfile

@@ -12,8 +12,9 @@ RUN yum -y install epel-release \
     && yum -y install ansible sudo git \
     && ansible-galaxy install -p /opt/setup/roles -r requirements.yml
 
-ARG OMERO_VERSION=5.6.0-m3
+ARG OMERO_VERSION=5.6.0-m4
 ARG OMEGO_ADDITIONAL_ARGS=
+ENV OMERODIR=/opt/omero/server/OMERO.server/
 RUN ansible-playbook playbook.yml \
     -e omero_server_release=$OMERO_VERSION \
     -e omero_server_omego_additional_args="$OMEGO_ADDITIONAL_ARGS"
@@ -28,5 +29,4 @@ USER omero-server
 EXPOSE 4063 4064
 VOLUME ["/OMERO", "/opt/omero/server/OMERO.server/var"]
 
-ENV OMERODIR=/opt/omero/server/OMERO.server/
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

playbook.yml

@@ -10,4 +10,3 @@
     omero_server_system_uid: 1000
     omero_server_virtualenv: True
     omero_server_python3: True
-    omero_server_python3_replace_omero: False

requirements.yml

@@ -16,8 +16,8 @@
   version: 2.0.1
 
 - name: ome.omero_server
-  src: https://github.com/ome/ansible-role-omero-server/archive/605fe70f3a93e1fb4accfc485a5a6359d28181f0.tar.gz
-  version: 605fe70f3a93e1fb4accfc485a5a6359d28181f0
+  src: https://github.com/ome/ansible-role-omero-server/archive/0eaeba62a9ec5f54a68522b6c79d6f5288ec927e.tar.gz
+  version: 0eaeba62a9ec5f54a68522b6c79d6f5288ec927e
 
 - src: ome.postgresql
   version: 3.3.1