Update to use latest omero-server ansible role

Author: manics

Dockerfile

@@ -1,35 +1,24 @@
 FROM centos:centos7
 MAINTAINER ome-devel@lists.openmicroscopy.org.uk
 
-ARG OMERO_VERSION=latest
-ARG CI_SERVER
-ARG OMEGO_ARGS
-
-WORKDIR /home/omero
-
-ADD omero-grid-deps.yml requirements.yml slave.cfg run.sh process_defaultxml.py /home/omero/
+RUN mkdir /opt/setup
+WORKDIR /opt/setup
+ADD playbook.yml requirements.yml /opt/setup/
 
 RUN yum -y install epel-release \
-    && yum -y install ansible \
-    && ansible-galaxy install -r requirements.yml \
-    && ansible-playbook omero-grid-deps.yml \
-    && pip install omego \
-    && useradd omero \
-    && chown omero:omero -R . \
-    # https://github.com/docker/docker/issues/2259#issuecomment-48286811
-    && mkdir /OMERO \
-    # Ensure /OMERO is owned by the omero user
-    && chown omero:omero -R /OMERO
+    && yum -y install ansible sudo \
+    && ansible-galaxy install -p /opt/setup/roles -r requirements.yml
 
-USER omero
+ARG OMERO_VERSION=latest
+RUN ansible-playbook playbook.yml -e omero_server_release=$OMERO_VERSION
+
+USER omero-server
 
-RUN bash -c 'CI=; if [ -n "$CI_SERVER" ]; then CI="--ci $CI_SERVER"; fi; \
-             omego download server $CI --release $OMERO_VERSION $OMEGO_ARGS' \
-    && rm OMERO.server-*.zip \
-    && ln -s OMERO.server-*/ OMERO.server \
-    # default.xml may be modified at runtime for a multinode configuration
-    && cp OMERO.server/etc/templates/grid/default.xml OMERO.server/etc/templates/grid/default.xml.orig
+# default.xml may be modified at runtime for a multinode configuration
+RUN cp /opt/omero/server/OMERO.server/etc/templates/grid/default.xml /opt/omero/server/OMERO.server/etc/templates/grid/default.xml.orig
 
 EXPOSE 4061 4063 4064
-VOLUME ["/OMERO", "/home/omero/OMERO.server/var"]
-ENTRYPOINT ["/home/omero/run.sh"]
+VOLUME ["/OMERO", "/opt/omero/server/OMERO.server/var"]
+
+ADD slave.cfg run.sh process_defaultxml.py /opt/omero/server/
+ENTRYPOINT ["/opt/omero/server/run.sh"]

omero-grid-deps.yml

@@ -0,0 +1,7 @@
+- hosts: localhost
+  roles:
+  - role: openmicroscopy.omero-server
+  vars:
+    ice_version: "3.6"
+    omero_server_database_manage: False
+    omero_server_systemd_setup: False

playbook.yml

@@ -4,13 +4,23 @@
   version: 1.0.0
 
 - src: openmicroscopy.ice
-  version: 1.0.0
+  version: 2.0.0
 
 - src: openmicroscopy.java
-  version: 1.0.0
+  version: 2.0.0
+
+- src: openmicroscopy.omego
+  version: 0.1.0
+
+- src: openmicroscopy.omero-common
+  version: 0.1.0
 
 - src: openmicroscopy.omero-python-deps
-  version: 1.0.0
+  version: 1.1.0
+
+- name: openmicroscopy.omero-server
+#  version: 2.0.0-m1
+  src: https://github.com/manics/ansible-role-omero-server/archive/devel.tar.gz
 
 - src: openmicroscopy.postgresql
-  version: 1.0.0
+  version: 2.0.0

requirements.yml

@@ -4,8 +4,9 @@ set -eu
 
 TARGET=${1:-master}
 
-OMERO_SERVER=/home/omero/OMERO.server
+OMERO_SERVER=/opt/omero/server/OMERO.server
 omero=$OMERO_SERVER/bin/omero
+cd /opt/omero/server
 
 if [ "$TARGET" = bash ]; then
     echo "Entering a shell"
@@ -54,7 +55,8 @@ elif [ "$TARGET" = master ]; then
         echo "Initialising database"
         DBCMD=init
     }
-    omego db $DBCMD --dbhost "$DBHOST" --dbuser "$DBUSER" --dbname "$DBNAME" \
+    /opt/omero/omego/bin/omego db $DBCMD \
+        --dbhost "$DBHOST" --dbuser "$DBUSER" --dbname "$DBNAME" \
         --dbpass "$DBPASS" --rootpass "$ROOTPASS" --serverdir=OMERO.server
 
     $omero config set omero.db.host "$DBHOST"
@@ -92,7 +94,7 @@ else
 
     echo "Master addr: $MASTER_ADDR Slave addr: $SLAVE_ADDR"
     sed -e "s/@omero.slave.host@/$SLAVE_ADDR/" -e "s/@slave.name@/$TARGET/" \
-        OMERO.server/etc/templates/slave.cfg > OMERO.server/etc/$TARGET.cfg
+        slave.cfg > OMERO.server/etc/$TARGET.cfg
     grep '^Ice.Default.Router=' OMERO.server/etc/ice.config || \
         echo Ice.Default.Router= >> OMERO.server/etc/ice.config
     sed -i -r "s|^(Ice.Default.Router=).*|\1OMERO.Glacier2/router:tcp -p 4063 -h $MASTER_ADDR|" \