Merge pull request #12 from manics/standalone

Standalone OMERO.web image using whitenoise

Author: joshmoore

README.md

@@ -4,23 +4,36 @@ OMERO.web Docker
 A CentOS 7 based Docker image for OMERO.web.
 
 
-Running the image
------------------
+Standalone image: omero-web-standalone
+--------------------------------------
+
+The quickest way to obtain a running OMERO.web server is to use
+the [standalone image](https://hub.docker.com/r/openmicroscopy/omero-web-standalone/)
+which uses the [WhiteNoise package](http://whitenoise.evans.io/en/stable/)
+to avoid the need for Nginx.
 
 To run the Docker image you can set a single OMERO.server to connect to by defining `OMEROHOST`:
 
     docker run -d --name omero-web \
         -e OMEROHOST=omero.example.org \
         -p 4080:4080 \
-        openmicroscopy/omero-web
+        openmicroscopy/omero-web-standalone
 
 Alternative all configuration options can be set using environment variables, for example:
 
     docker run -d --name omero-web \
         -e CONFIG_omero_web_server__list='[["omero.example.org", 4064, "omero"]]' \
         -e CONFIG_omero_web_debug=true \
         -p 4080:4080 \
-        openmicroscopy/omero-web
+        openmicroscopy/omero-web-standalone
+
+
+Minimal OMERO.web image: omero-web
+----------------------------------
+
+[omero-web](https://hub.docker.com/r/openmicroscopy/omero-web/)
+is a minimal OMERO.web image which requires additional configuration for serving Django static files.
+For example, you can use https://github.com/dpwrussell/omero-nginx-docker
 
 
 Configuration

standalone/Dockerfile

@@ -0,0 +1,7 @@
+FROM openmicroscopy/omero-web:latest
+MAINTAINER [email protected]
+
+USER root
+RUN /opt/omero/web/venv/bin/pip install 'whitenoise<4' && \
+    echo "config append -- omero.web.middleware '{\"index\": 0, \"class\": \"whitenoise.middleware.WhiteNoiseMiddleware\"}'" > /opt/omero/web/config/whitenoise.omero
+USER omero-web

test.sh

@@ -5,6 +5,7 @@ set -u
 
 PREFIX=test
 IMAGE=omero-web:$PREFIX
+STANDLONE=omero-web-standalone:$PREFIX
 
 CLEAN=${CLEAN:-y}
 
@@ -27,3 +28,16 @@ docker run -d --name $PREFIX-web \
     $IMAGE
 
 bash test_getweb.sh
+
+# Standalone image
+cleanup
+sed -i "s/FROM .*/FROM $IMAGE/" standalone/Dockerfile
+
+docker build -t $STANDLONE standalone/
+docker run -d --name $PREFIX-web \
+    -e CONFIG_omero_web_server__list='[["omero.example.org", 4064, "test-omero"]]' \
+    -e CONFIG_omero_web_debug=true \
+    -p 4080:4080 \
+    $STANDLONE
+
+bash test_getweb.sh