diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000000..5f492ea0594
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1 @@
+# See `conf/docker` for Docker images
diff --git a/conf/docker/build.sh b/conf/docker/build.sh
new file mode 100755
index 00000000000..a4828ba607f
--- /dev/null
+++ b/conf/docker/build.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Creates images and pushes them to Docker Hub.
+# The "kick-the-tires" tag should be relatively stable. No breaking changes.
+# Push to custom tags or tags based on branch names to iterate on the images.
+if [ -z "$1" ]; then
+  echo "No argument supplied. Please specify \"branch\" or \"custom my-custom-tag\" for experiments or \"stable\" if your change won't break anything."
+  exit 1
+fi
+
+if [ "$1" == 'branch' ]; then
+  echo "We'll push a tag to the branch you're on."
+  GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+  TAG=$GIT_BRANCH
+elif [ "$1" == 'stable' ]; then
+  echo "We'll push a tag to the most stable tag (which isn't saying much!)."
+  TAG=kick-the-tires
+elif [ "$1" == 'custom' ]; then
+  if [ -z "$1" ]; then
+    echo "You must provide a custom tag as the second argument."
+    exit 1
+  else
+    echo "We'll push a custom tag."
+    TAG=$2
+  fi
+else
+  echo "Unexpected argument: $1. Exiting. Run with no arguments for help."
+  exit 1
+fi
+echo Images will be pushed to Docker Hub with the tag \"$TAG\".
+# Use "conf" directory as context so we can copy schema.xml into Solr image.
+docker build -t iqss/dataverse-solr:$TAG -f solr/Dockerfile ../../conf
+docker push iqss/dataverse-solr:$TAG
+# TODO: Think about if we really need dataverse.war because it's in dvinstall.zip.
+# FIXME: Automate the building of dataverse.war and dvinstall.zip. Think about https://github.com/IQSS/dataverse/issues/3974 and https://github.com/IQSS/dataverse/pull/3975
+cp ../../target/dataverse*.war dataverse-glassfish/dataverse.war
+cp ../../scripts/installer/dvinstall.zip dataverse-glassfish
+cp ../../doc/sphinx-guides/source/_static/util/default.config dataverse-glassfish
+cp ../../downloads/glassfish-4.1.zip dataverse-glassfish
+cp ../../downloads/weld-osgi-bundle-2.2.10.Final-glassfish4.jar dataverse-glassfish
+docker build -t iqss/dataverse-glassfish:$TAG dataverse-glassfish
+# FIXME: Check the output of `docker build` and only push on success.
+docker push iqss/dataverse-glassfish:$TAG
diff --git a/conf/docker/dataverse-glassfish/.gitignore b/conf/docker/dataverse-glassfish/.gitignore
new file mode 100644
index 00000000000..b0e6e38894f
--- /dev/null
+++ b/conf/docker/dataverse-glassfish/.gitignore
@@ -0,0 +1,5 @@
+glassfish-4.1.zip
+weld-osgi-bundle-2.2.10.Final-glassfish4.jar
+dvinstall.zip
+dataverse.war
+default.config
diff --git a/conf/docker/dataverse-glassfish/Dockerfile b/conf/docker/dataverse-glassfish/Dockerfile
new file mode 100644
index 00000000000..939ce98fb72
--- /dev/null
+++ b/conf/docker/dataverse-glassfish/Dockerfile
@@ -0,0 +1,98 @@
+FROM centos:7.2.1511
+MAINTAINER Dataverse (support@dataverse.org)
+
+COPY glassfish-4.1.zip /tmp
+COPY weld-osgi-bundle-2.2.10.Final-glassfish4.jar /tmp
+COPY default.config /tmp
+COPY dvinstall.zip /tmp
+
+# Install dependencies
+#RUN yum install -y unzip
+RUN yum install -y \
+    cronie \
+    git \
+    java-1.8.0-openjdk-devel \
+    nc \
+    perl \
+    postgresql \
+    sha1sum \
+    unzip \
+    wget
+
+ENV GLASSFISH_DOWNLOAD_SHA1 d1a103d06682eb08722fbc9a93089211befaa080
+ENV GLASSFISH_DIRECTORY "/usr/local/glassfish4"
+ENV HOST_DNS_ADDRESS "localhost"
+ENV POSTGRES_DB "dvndb"
+ENV POSTGRES_USER "dvnapp"
+ENV RSERVE_USER "rserve"
+ENV RSERVE_PASSWORD "rserve"
+
+#RUN ls /tmp
+#
+RUN find /tmp
+#
+#RUN exitEarly
+
+# Install Glassfish 4.1
+
+RUN cd /tmp \ 
+    && unzip glassfish-4.1.zip \
+    && mv glassfish4 /usr/local \
+    && cd /usr/local/glassfish4/glassfish/modules \
+    && rm weld-osgi-bundle.jar \
+    && cp /tmp/weld-osgi-bundle-2.2.10.Final-glassfish4.jar . \
+    #FIXME: Patch Grizzly too!
+    && echo "Done installing and patching Glassfish"
+
+RUN chmod g=u /etc/passwd
+
+RUN mkdir -p /home/glassfish
+RUN chgrp -R 0 /home/glassfish && \
+    chmod -R g=u /home/glassfish
+
+RUN mkdir -p /usr/local/glassfish4
+RUN chgrp -R 0 /usr/local/glassfish4 && \
+    chmod -R g=u /usr/local/glassfish4
+
+
+#RUN exitEarlyBeforeJq
+RUN yum -y install epel-release
+RUN yum install -y jq 
+
+# Install jq
+#RUN cd /tmp \  
+#    && wget https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \
+#    && mv jq-linux64 /usr/local/bin \
+#    && chmod +x /usr/local/bin/jq-linux64 \
+#    && ln -s /usr/local/bin/jq-linux64 /usr/local/bin/jq
+
+# Customized persistence xml to avoid database recreation
+#RUN mkdir -p /tmp/WEB-INF/classes/META-INF/ 
+#COPY WEB-INF/classes/META-INF/persistence.xml /tmp/WEB-INF/classes/META-INF/
+
+# Install iRods iCommands
+#RUN  cd /tmp \
+#   && yum -y install epel-release \
+#   && yum -y install ftp://ftp.renci.org/pub/irods/releases/4.1.6/centos7/irods-icommands-4.1.6-centos7-x86_64.rpm 
+
+#COPY config-glassfish /root/dvinstall
+#COPY restart-glassfish /root/dvinstall
+#COPY config-dataverse /root/dvinstall
+
+#RUN cd /root/dvinstall && ./config-dataverse
+
+COPY ./entrypoint.sh /
+#COPY ./ddl /root/dvinstall
+#COPY ./init-postgres /root/dvinstall
+#COPY ./init-glassfish /root/dvinstall
+#COPY ./init-dataverse /root/dvinstall
+#COPY ./setup-all.sh /root/dvinstall
+#COPY ./setup-irods.sh /root/dvinstall
+COPY ./Dockerfile /
+
+VOLUME /usr/local/glassfish4/glassfish/domains/domain1/files
+
+EXPOSE      8080 
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["dataverse"]
diff --git a/conf/docker/dataverse-glassfish/entrypoint.sh b/conf/docker/dataverse-glassfish/entrypoint.sh
new file mode 100755
index 00000000000..bc1b7eb3f93
--- /dev/null
+++ b/conf/docker/dataverse-glassfish/entrypoint.sh
@@ -0,0 +1,135 @@
+#!/bin/bash -x
+
+# Entrypoint script for Dataverse web application. This script waits
+# for dependent services (Rserve, Postgres, Solr) to start before
+# initializing Glassfish.
+
+echo "whoami before..."
+whoami
+if ! whoami &> /dev/null; then
+  if [ -w /etc/passwd ]; then
+    # Make `whoami` return the glassfish user.  # See https://docs.openshift.org/3.6/creating_images/guidelines.html#openshift-origin-specific-guidelines
+    # Fancy bash magic from https://github.com/RHsyseng/container-rhel-examples/blob/1208dcd7d4f431fc6598184dba6341b9465f4197/starter-arbitrary-uid/bin/uid_entrypoint#L4
+    echo "${USER_NAME:-glassfish}:x:$(id -u):0:${USER_NAME:-glassfish} user:/home/glassfish:/bin/bash" >> /etc/passwd
+  fi
+fi
+echo "whoami after"
+whoami
+
+set -e
+
+if [ "$1" = 'dataverse' ]; then
+
+    export GLASSFISH_DIRECTORY=/usr/local/glassfish4
+    export HOST_DNS_ADDRESS=localhost
+
+    TIMEOUT=30
+
+    if [ -n "$RSERVE_SERVICE_HOST" ]; then
+        RSERVE_HOST=$RSERVE_SERVICE_HOST
+    elif [ -n "$RSERVE_PORT_6311_TCP_ADDR" ]; then
+        RSERVE_HOST=$RSERVE_PORT_6311_TCP_ADDR
+    elif [ -z "$RSERVE_HOST" ]; then
+        RSERVE_HOST="localhost"
+    fi
+    export RSERVE_HOST
+    
+    if [ -n "$RSERVE_SERVICE_PORT" ]; then
+        RSERVE_PORT=$RSERVE_SERVICE_PORT
+    elif [ -n "$RSERVE_PORT_6311_TCP_PORT" ]; then
+        RSERVE_PORT=$RSERVE_PORT_6311_TCP_PORT
+    elif [ -z "$RSERVE_PORT" ]; then
+        RSERVE_PORT="6311"
+    fi
+    export RSERVE_PORT
+
+    echo "Using Rserve at $RSERVE_HOST:$RSERVE_PORT"
+    
+    if ncat $RSERVE_HOST $RSERVE_PORT -w $TIMEOUT --send-only < /dev/null > /dev/null 2>&1 ; then 
+        echo Rserve running; 
+    else
+        echo Optional service Rserve not running. 
+    fi
+    
+    
+    # postgres
+    if [ -n "$POSTGRES_SERVICE_HOST" ]; then
+        POSTGRES_HOST=$POSTGRES_SERVICE_HOST
+    elif [ -n "$POSTGRES_PORT_5432_TCP_ADDR" ]; then
+        POSTGRES_HOST=$POSTGRES_PORT_5432_TCP_ADDR
+    elif [ -z "$POSTGRES_HOST" ]; then
+        POSTGRES_HOST="localhost"
+    fi
+    export POSTGRES_HOST
+    
+    if [ -n "$POSTGRES_SERVICE_PORT" ]; then
+        POSTGRES_PORT=$POSTGRES_SERVICE_PORT
+    elif [ -n "$POSTGRES_PORT_5432_TCP_PORT" ]; then
+        POSTGRES_PORT=$POSTGRES_PORT_5432_TCP_PORT
+    else
+        POSTGRES_PORT=5432
+    fi 
+    export POSTGRES_PORT
+
+    echo "Using Postgres at $POSTGRES_HOST:$POSTGRES_PORT"
+    
+    if ncat $POSTGRES_HOST $POSTGRES_PORT -w $TIMEOUT --send-only < /dev/null > /dev/null 2>&1 ; then 
+        echo Postgres running; 
+    else
+        echo Required service Postgres not running. Have you started the required services?
+        exit 1 
+    fi
+    
+    # solr
+    if [ -n "$SOLR_SERVICE_HOST" ]; then
+        SOLR_HOST=$SOLR_SERVICE_HOST
+    elif [ -n "$SOLR_PORT_8983_TCP_ADDR" ]; then
+        SOLR_HOST=$SOLR_PORT_8983_TCP_ADDR
+    elif [ -z "$SOLR_HOST" ]; then
+        SOLR_HOST="localhost"
+    fi
+    export SOLR_HOST
+    
+    if [ -n "$SOLR_SERVICE_PORT" ]; then
+        SOLR_PORT=$SOLR_SERVICE_PORT
+    elif [ -n "$SOLR_PORT_8983_TCP_PORT" ]; then
+        SOLR_PORT=$SOLR_PORT_8983_TCP_PORT
+    else
+        SOLR_PORT=8983
+    fi 
+    export SOLR_PORT
+    
+    echo "Using Solr at $SOLR_HOST:$SOLR_PORT"
+
+    if ncat $SOLR_HOST $SOLR_PORT -w $TIMEOUT --send-only < /dev/null > /dev/null 2>&1 ; then 
+        echo Solr running; 
+    else
+        echo Required service Solr not running. Have you started the required services?
+        exit 1 
+    fi
+    
+    GLASSFISH_INSTALL_DIR="/usr/local/glassfish4"
+    cd $GLASSFISH_INSTALL_DIR
+    cp /tmp/dvinstall.zip $GLASSFISH_INSTALL_DIR
+    unzip dvinstall.zip
+    cd dvinstall
+    echo Copying the non-interactive file into place
+    cp /tmp/default.config .
+    echo Looking at first few lines of default.config
+    head default.config
+    # non-interactive install
+    echo Running non-interactive install
+    #./install -y -f > install.out 2> install.err
+    ./install -y -f
+
+#    if [ -n "$DVICAT_PORT_1247_TCP_PORT" ]; then
+#        ./setup-irods.sh
+#    fi
+
+    echo -e "\n\nDataverse started"
+
+    sleep infinity
+else
+    exec "$@"
+fi
+
diff --git a/conf/docker/postgresql/Dockerfile b/conf/docker/postgresql/Dockerfile
new file mode 100644
index 00000000000..81ecf0fdeb8
--- /dev/null
+++ b/conf/docker/postgresql/Dockerfile
@@ -0,0 +1,3 @@
+# PostgreSQL for Dataverse (but consider switching to the image from CentOS)
+#
+# See also conf/docker/dataverse-glassfish/Dockerfile
diff --git a/conf/docker/solr/Dockerfile b/conf/docker/solr/Dockerfile
new file mode 100644
index 00000000000..99114ce6a6d
--- /dev/null
+++ b/conf/docker/solr/Dockerfile
@@ -0,0 +1,28 @@
+FROM centos:7.2.1511
+MAINTAINER Dataverse (support@dataverse.org)
+
+RUN yum install -y wget unzip perl git java-1.8.0-openjdk-devel postgresql.x86_64
+
+# Install Solr 4.6.0
+# The context of the build is the "conf" directory.
+COPY solr/4.6.0/schema.xml /tmp
+
+RUN cd /tmp && wget https://archive.apache.org/dist/lucene/solr/4.6.0/solr-4.6.0.tgz  && \
+	tar xvzf solr-4.6.0.tgz  && \
+	mv solr-4.6.0 /usr/local/  && \
+	cd /usr/local/solr-4.6.0/example/solr/collection1/conf/  && \
+	mv schema.xml schema.xml.backup  && \
+	cp /tmp/schema.xml . && \
+	rm /tmp/solr-4.6.0.tgz
+
+RUN ln -s /usr/local/solr-4.6.0/example/logs /var/log/solr
+
+VOLUME  /usr/local/solr-4.6.0/example/solr/collection1/data
+
+EXPOSE 8983
+
+COPY docker/solr/Dockerfile /Dockerfile
+COPY docker/solr/entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["solr"]
diff --git a/conf/docker/solr/entrypoint.sh b/conf/docker/solr/entrypoint.sh
new file mode 100755
index 00000000000..7fd8d6380c2
--- /dev/null
+++ b/conf/docker/solr/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ "$1" = 'solr' ]; then
+    cd /usr/local/solr-4.6.0/example/
+    java -jar start.jar 
+elif [ "$1" = 'usage' ]; then
+    echo  'docker run -d iqss/dataverse-solr solr'
+else
+    exec "$@"
+fi
diff --git a/conf/openshift/openshift.json b/conf/openshift/openshift.json
new file mode 100644
index 00000000000..ec0442d401c
--- /dev/null
+++ b/conf/openshift/openshift.json
@@ -0,0 +1,237 @@
+{
+  "kind": "Template",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "dataverse",
+    "labels": {
+      "name": "dataverse"
+    },
+    "annotations": {
+      "openshift.io/description": "Dataverse is open source research data repository software: https://dataverse.org",
+      "openshift.io/display-name": "Dataverse"
+    }
+  },
+  "objects": [
+    {
+      "kind": "Service",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "dataverse-glassfish-service"
+      },
+      "spec": {
+        "selector": {
+          "name": "iqss-dataverse-glassfish"
+        },
+        "ports": [
+          {
+            "name": "web",
+            "protocol": "TCP",
+            "port": 8080,
+            "targetPort": 8080
+          }
+        ]
+      }
+    },
+    {
+      "kind": "ImageStream",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "dataverse-plus-glassfish"
+      },
+      "spec": {
+        "dockerImageRepository": "iqss/dataverse-glassfish"
+      }
+    },
+    {
+      "kind": "ImageStream",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "centos-postgresql-94-centos7"
+      },
+      "spec": {
+        "dockerImageRepository": "centos/postgresql-94-centos7"
+      }
+    },
+    {
+      "kind": "ImageStream",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "iqss-dataverse-solr"
+      },
+      "spec": {
+        "dockerImageRepository": "iqss/dataverse-solr"
+      }
+    },
+    {
+      "kind": "DeploymentConfig",
+      "apiVersion": "v1",
+      "metadata": {
+        "name": "deploy-dataverse-glassfish",
+        "annotations": {
+          "template.alpha.openshift.io/wait-for-ready": "true"
+        }
+      },
+      "spec": {
+        "template": {
+          "metadata": {
+            "labels": {
+              "name": "iqss-dataverse-glassfish"
+            }
+          },
+          "spec": {
+            "containers": [
+              {
+                "name": "dataverse-plus-glassfish",
+                "image": "dataverse-plus-glassfish",
+                "ports": [
+                  {
+                    "containerPort": 8080,
+                    "protocol": "TCP"
+                  }
+                ],
+                "env": [
+                  {
+                    "name": "ADMIN_PASSWORD",
+                    "value": "admin"
+                  },
+                  {
+                    "name": "SMTP_HOST",
+                    "value": "localhost"
+                  },
+                  {
+                    "name": "POSTGRES_USER",
+                    "value": "dvnapp"
+                  },
+                  {
+                    "name": "POSTGRES_PASSWORD",
+                    "value": "dvnappPassword"
+                  },
+                  {
+                    "name": "POSTGRES_DATABASE",
+                    "value": "dvndb"
+                  }
+                ],
+                "imagePullPolicy": "IfNotPresent",
+                "securityContext": {
+                  "capabilities": {},
+                  "privileged": false
+                }
+              },
+              {
+                "name": "centos-postgresql-94-centos7",
+                "image": "centos-postgresql-94-centos7",
+                "ports": [
+                  {
+                    "containerPort": 5432,
+                    "protocol": "TCP"
+                  }
+                ],
+                "env": [
+                  {
+                    "name": "POSTGRESQL_USER",
+                    "value": "pgUserValue"
+                  },
+                  {
+                    "name": "POSTGRESQL_PASSWORD",
+                    "value": "pgPasswordValue"
+                  },
+                  {
+                    "name": "POSTGRESQL_DATABASE",
+                    "value": "pgDatabaseValue"
+                  }
+                ],
+                "resources": {
+                  "limits": {
+                    "memory": "256Mi"
+                  }
+                },
+                "imagePullPolicy": "IfNotPresent",
+                "securityContext": {
+                  "capabilities": {},
+                  "privileged": false
+                }
+              },
+              {
+                "name": "iqss-dataverse-solr",
+                "image": "iqss-dataverse-solr",
+                "ports": [
+                  {
+                    "containerPort": 8983,
+                    "protocol": "TCP"
+                  }
+                ],
+                "resources": {
+                  "limits": {
+                    "memory": "256Mi"
+                  }
+                },
+                "imagePullPolicy": "IfNotPresent",
+                "securityContext": {
+                  "capabilities": {},
+                  "privileged": false
+                }
+              }
+            ]
+          }
+        },
+        "strategy": {
+          "type": "Rolling",
+          "rollingParams": {
+            "updatePeriodSeconds": 1,
+            "intervalSeconds": 1,
+            "timeoutSeconds": 300
+          },
+          "resources": {}
+        },
+        "triggers": [
+          {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": true,
+              "containerNames": [
+                "dataverse-plus-glassfish"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "dataverse-plus-glassfish:kick-the-tires"
+              }
+            }
+          },
+          {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": true,
+              "containerNames": [
+                "centos-postgresql-94-centos7"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "centos-postgresql-94-centos7:latest"
+              }
+            }
+          },
+          {
+            "type": "ImageChange",
+            "imageChangeParams": {
+              "automatic": true,
+              "containerNames": [
+                "iqss-dataverse-solr"
+              ],
+              "from": {
+                "kind": "ImageStreamTag",
+                "name": "iqss-dataverse-solr:kick-the-tires"
+              }
+            }
+          },
+          {
+            "type": "ConfigChange"
+          }
+        ],
+        "replicas": 1,
+        "selector": {
+          "name": "iqss-dataverse-glassfish"
+        }
+      }
+    }
+  ]
+}
diff --git a/doc/sphinx-guides/source/developers/dev-environment.rst b/doc/sphinx-guides/source/developers/dev-environment.rst
index 167cc7ba153..73cf0925549 100755
--- a/doc/sphinx-guides/source/developers/dev-environment.rst
+++ b/doc/sphinx-guides/source/developers/dev-environment.rst
@@ -29,7 +29,7 @@ As a `Java Enterprise Edition <http://en.wikipedia.org/wiki/Java_Platform,_Enter
 
 Glassfish 4.1 is required (not any earlier or later versions until https://github.com/IQSS/dataverse/issues/2628 is resolved), which can be downloaded from http://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip . If you have downloaded Glassfish as part of a Netbeans bundle, you can manually add the proper version by clicking "Tools", "Servers", "Add Server".
 
-By default, Glassfish reports analytics information.  The administration guide suggests this can be disabled with ``asadmin create-jvm-options -Dcom.sun.enterprise.tools.admingui.NO_NETWORK=true``, should this be found to be undesirable for development purposes.
+By default, Glassfish reports analytics information. The administration guide suggests this can be disabled with ``asadmin create-jvm-options -Dcom.sun.enterprise.tools.admingui.NO_NETWORK=true``, should this be found to be undesirable for development purposes.
 
 PostgreSQL
 ~~~~~~~~~~
@@ -94,7 +94,7 @@ From the terminal, ``ssh-keygen`` will create new ssh keys for you:
 Clone Project from GitHub
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Before cloning the repo, you are invited to read about our branching strategy in the  :doc:`version-control` section but we'll explain the basics here.
+Before cloning the repo, you are invited to read about our branching strategy in the :doc:`version-control` section but we'll explain the basics here.
 
 Determine Which Repo To Push To
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -333,6 +333,219 @@ If you've reconfigured from EZID to DataCite and are seeing ``Response code: 400
 
 ``asadmin create-jvm-options '-Ddataverse.siteUrl=http\://demo.dataverse.org'``
 
+OpenShift
+---------
+
+From the Dataverse perspective, we are in the business of providing a "template" for OpenShift that describes how the various components we build our application on (Glassfish, PostgreSQL, Solr, the Dataverse war file itself, etc.) work together. We publish Docker images to DockerHub at https://hub.docker.com/u/iqss/ that are used in the OpenShift template. Dataverse's use of Docker is documented below in a separate section.
+
+
+The OpenShift template for Dataverse can be found at ``conf/openshift/openshift.json`` and if you need to hack on the template or related files under ``conf/docker`` it is recommended that you iterate on them using Minishift.
+
+Install Minishift
+~~~~~~~~~~~~~~~~~
+
+Minishift requires a hypervisor and since we already use VirtualBox for Vagrant, you should install VirtualBox from http://virtualbox.org .
+
+Download the Minishift tarball from https://docs.openshift.org/latest/minishift/getting-started/installing.html and put the ``minishift`` binary in ``/usr/local/bin`` or somewhere in your ``$PATH``. This assumes Mac or Linux.
+
+At this point, you might want to consider going through the Minishift quickstart to get oriented: https://docs.openshift.org/latest/minishift/getting-started/quickstart.html
+
+Start Minishift
+~~~~~~~~~~~~~~~
+
+``minishift start --vm-driver=virtualbox``
+
+Make the OpenShift Client Binary (oc) Executable
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``eval $(minishift oc-env)``
+
+Log in to Minishift
+~~~~~~~~~~~~~~~~~~~
+
+Note that if you just installed Minishift, you are probably logged in already, but it doesn't hurt to log in again.
+
+``oc login --username developer --password=whatever``
+
+Use "developer" as the username and a couple characters as the password.
+
+Create a Minishift Project
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``oc new-project project1``
+
+Create a Dataverse App within the Minishift Project
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Run this command from inside the vanilla Dataverse application to download images from Docker Hub and use them to create a Dataverse Minishift application. Alternatively, the ``openshift.json`` file can be downloaded directly from our github repo.
+
+``oc new-app conf/openshift/openshift.json``
+
+Check Status of Dataverse Deployment to Minishift
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``oc status``
+
+Once images have been downloaded from Docker Hub, the output below will change from ``Pulling`` to ``Pulled``.
+
+``oc get events | grep Pull``
+
+This is a deep dive:
+
+``oc get all``
+
+Review Logs of Dataverse Deployment to Minishift
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``oc logs -c dataverse-plus-glassfish $(oc get po -o json | jq '.items[] | select(.kind=="Pod").metadata.name' -r | grep -v dataverse-glassfish-1-deploy)``
+
+Get a Shell (ssh/rsh) on Glassfish Server Deployed to Minishift
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``oc rsh $(oc get po -o json | jq '.items[] | select(.kind=="Pod").metadata.name' -r | grep -v dataverse-glassfish-1-deploy)``
+
+From the ``rsh`` prompt you could run something like the following to build confidence that Dataverse is running on port 8080:
+
+``curl -L localhost:8080``
+
+Make the Dataverse App Available Via HTTP
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, check the IP address of your minishift cluster. If this differs from the IP address used below, replace it.
+
+``minishift ip``
+
+The following curl command is expected to fail until you "expose" the HTTP service. Please note that the IP address may be different.
+
+``curl http://dataverse-glassfish-service-project1.192.168.99.100.nip.io/api/info/version``
+
+Expose the Dataverse web service:
+
+``oc expose svc/dataverse-glassfish-service``
+
+Make Sure the Dataverse API is Working
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This should show a version number but please note that the IP address may be different:
+
+``curl http://dataverse-glassfish-service-project1.192.168.99.100.nip.io/api/info/version``
+
+Log into Minishift and Visit Dataverse in your Browser
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- https://192.168.99.100:8443
+- username: developer
+- password: developer
+
+Visit https://192.168.99.100:8443/console/project/project1/browse/routes and click http://dataverse-glassfish-service-project1.192.168.99.100.nip.io/ or whatever is shows under "Routes External Traffic" (the IP address may be different). This assumes you named your project ``project1``.
+
+You should be able to log in with username "dataverseAdmin" and password "admin".
+
+Cleaning up
+~~~~~~~~~~~
+
+Note that it can take a few minutes for the deletion of a project to be complete and there doesn't seem to be a great way to know when it's safe to run ``oc new-project project1`` again, slowing down the development feedback loop. FIXME: Find a way to iterate faster.
+
+``oc delete project project1``
+
+Making Changes
+~~~~~~~~~~~~~~
+
+If you're interested in using Minishift for development and want to change the Dataverse code, you will need to get set up to create Docker images based on your changes and push them to a Docker registry such as Docker Hub. See the section below on Docker for details.
+
+Runnning Containers to Run as Root in Minishift
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It is **not** recommended to run containers as root in Minishift because for security reasons OpenShift doesn't support running containers as root. However, it's good to know how to allow containers to run as root in case you need to work on a Docker image to make it run as non-root.
+
+For more information on improving Docker images to run as non-root, see "Support Arbitrary User IDs" at https://docs.openshift.org/latest/creating_images/guidelines.html#openshift-origin-specific-guidelines
+
+Let's say you have a container that you suspect works fine when it runs as root. You want to see it working as-is before you start hacking on the Dockerfile and entrypoint file. You can configure Minishift to allow containers to run as root with this command:
+
+``oc adm policy add-scc-to-user anyuid -z default --as system:admin``
+
+Once you are done testing you can revert Minishift back to not allowing containers to run as root with this command:
+
+``oc adm policy remove-scc-from-user anyuid -z default --as system:admin``
+
+Minishift Resources
+~~~~~~~~~~~~~~~~~~~
+
+The following resources might be helpful.
+
+- https://blog.openshift.com/part-1-from-app-to-openshift-runtimes-and-templates/
+- https://blog.openshift.com/part-2-creating-a-template-a-technical-walkthrough/
+- https://docs.openshift.com/enterprise/3.0/architecture/core_concepts/templates.html
+
+Docker
+------
+
+Minishift makes use of Docker images on Docker Hub. To build new Docker images and push them to Docker Hub, you'll need to install Docker.
+
+Installing Docker
+~~~~~~~~~~~~~~~~~
+
+On Linux, you can probably get Docker from your package manager.
+
+On Mac, download the ``.dmg`` from https://www.docker.com and install it. As of this writing is it known as Docker Community Edition for Mac.
+
+On Windows, FIXME ("Docker Community Edition for Windows" maybe???).
+
+We're working with Docker in the context of Minishift so if you haven't installed Minishift yet, follow the instructions above and make sure you get the Dataverse Docker images running in Minishift before you start messing with them.
+
+Editing Dataverse Docker Images
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As of this writing, the Dataverse Docker images we publish under https://hub.docker.com/u/iqss/ are highly experimental. They're tagged with branch names like ``kick-the-tires`` rather than release numbers.
+
+Change to the docker directory:
+
+``cd conf/docker``
+
+Edit one of the files:
+
+``vim dataverse-glassfish/Dockerfile``
+
+At this point you want to build the image and run it. We are assuming you want to run it in your Minishift environment. We will be building your image and pushing it to Docker Hub. Then you will be pulling the image down from Docker Hub to run in your Minishift installation. If this sounds inefficient, you're right, but we haven't been able to figure out how to make use of Minishift's built in registry (see below) so we're pushing to Docker Hub instead.
+
+Log in to Docker Hub with an account that has access to push to the ``iqss`` organization:
+
+``docker login``
+
+(If you don't have access to push to the ``iqss`` organization, you can push elsewhere and adjust your ``openshift.json`` file accordingly.)
+
+Build and push the images to Docker Hub:
+
+``./build.sh``
+
+Note that you will see output such as ``digest: sha256:213b6380e6ee92607db5d02c9e88d7591d81f4b6d713224d47003d5807b93d4b`` that should later be reflected in Minishift to indicate that you are using the latest image you just pushed to Docker Hub.
+
+You can get a list of all repos under the ``iqss`` organization with this:
+
+``curl https://hub.docker.com/v2/repositories/iqss/``
+
+To see a specific repo:
+
+``curl https://hub.docker.com/v2/repositories/iqss/dataverse-glassfish/``
+
+Known issues with Dataverse Docker images
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Again, Dataverse Docker images are highly experimental at this point. As of this writing, their purpose is primarily for kicking the tires on Dataverse. Here are some known issues:
+
+- The Dataverse installer is run in the entrypoint script every time you run the image. Ideally, Dataverse would be installed in the Dockerfile instead. Dataverse is being installed in the entrypoint script because it needs PosgreSQL to be up already so that database tables can be created when the war file is deployed.
+- The Docker images have to be run as root. See the discussion above.
+- The storage should be abstracted. Storage of data files and PostgreSQL data. Probably Solr data.
+- Better tuning of memory by examining ``/sys/fs/cgroup/memory/memory.limit_in_bytes`` and incorporating this into the Dataverse installation script.
+- Only a single Glassfish server can be used. See "Dedicated timer server in a Dataverse server cluster" in the :doc:`/admin/timers` section of the Installation Guide.
+- Only a single PostgreSQL server can be used.
+- Only a single Solr server can be used.
+
+Get Set Up to Push Docker Images to Minishift Registry
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+FIXME https://docs.openshift.org/latest/minishift/openshift/openshift-docker-registry.html indicates that it should be possible to make use of the builtin registry in Minishift while iterating on Docker images but you may get "unauthorized: authentication required" when trying to push to it as reported at https://github.com/minishift/minishift/issues/817 so until we figure this out, you must push to Docker Hub instead. Run ``docker login`` and use the ``conf/docker/build.sh`` script to push Docker images you create to https://hub.docker.com/u/iqss/
+
 ----
 
 Previous: :doc:`intro` | Next: :doc:`version-control`
diff --git a/doc/sphinx-guides/source/installation/config.rst b/doc/sphinx-guides/source/installation/config.rst
index 31bbed45c07..3c39d41f873 100644
--- a/doc/sphinx-guides/source/installation/config.rst
+++ b/doc/sphinx-guides/source/installation/config.rst
@@ -598,6 +598,11 @@ dataverse.handlenet.admprivphrase
 +++++++++++++++++++++++++++++++++
 This JVM setting is also part of **handles** configuration. The Handle.Net installer lets you choose whether to encrypt the admcredfile private key or not. If you do encrypt it, this is the pass phrase that it's encrypted with. 
 
+dataverse.timerServer
++++++++++++++++++++++
+
+This JVM option is only relevant if you plan to run multiple Glassfish servers for redundancy. Only one Glassfish server can act as the dedicated timer server and for details on promoting or demoting a Glassfish server to handle this responsibility, see :doc:`/admin/timers`.
+
 Database Settings
 -----------------
 
diff --git a/doc/sphinx-guides/source/installation/prep.rst b/doc/sphinx-guides/source/installation/prep.rst
index 9662b5c40b6..035106e62be 100644
--- a/doc/sphinx-guides/source/installation/prep.rst
+++ b/doc/sphinx-guides/source/installation/prep.rst
@@ -14,6 +14,13 @@ We'll try to get you up and running as quickly as possible, but we thought you m
 Choose Your Own Installation Adventure
 --------------------------------------
 
+NDS Labs Workbench (for Testing Only)
++++++++++++++++++++++++++++++++++++++
+
+The National Data Service (NDS) is community-driven effort guided by the National Data Service Consortium. NDS Labs has packaged Dataverse as `one of many data management tools <https://github.com/nds-org/ndslabs-specs>`_ that can be quickly deployed for evaluation purposes in their tool based on Kubernetes called NDS Labs Workbench. To get started, visit http://www.nationaldataservice.org/projects/labs.html .
+
+Please note that the version of Dataverse in NDS Labs Workbench may lag behind the latest release. Craig Willis from NDS Labs did an excellent job of adding Dataverse 4 to NDS Labs Workbench and the Dataverse team hopes to some day take over the creation of Docker images so the latest version of Dataverse can be evaluated in the workbench.
+
 Vagrant (for Testing Only)
 ++++++++++++++++++++++++++
 
diff --git a/scripts/installer/install b/scripts/installer/install
index a620cb00eaa..f86883ec17f 100755
--- a/scripts/installer/install
+++ b/scripts/installer/install
@@ -967,6 +967,35 @@ if ( -e "/proc/meminfo" && open MEMINFO, "/proc/meminfo" ) {
 
     close MEMINFO;
 
+# TODO: Figure out how to determine the amount of memory when running in Docker
+# because we're wondering if Dataverse can run in the free OpenShift Online
+# offering that only gives you 1 GB of memory. Obviously, if this is someone's
+# first impression of Dataverse, we want to to run well! What if you try to
+# ingest a large file or perform other memory-intensive operations? For more
+# context, see https://github.com/IQSS/dataverse/issues/4040#issuecomment-331282286
+    if ( -e "/sys/fs/cgroup/memory/memory.limit_in_bytes" && open CGROUPMEM, "/sys/fs/cgroup/memory/memory.limit_in_bytes" ) {
+        print "We must be running in Docker! Fancy!\n";
+        while ( my $limitline = <CGROUPMEM> ) {
+            # The goal of this cgroup check is for
+	    # "Setting the heap limit for Glassfish to 750MB"
+	    # to change to some other value, based on memory available.
+	    print "/sys/fs/cgroup/memory/memory.limit_in_bytes: $limitline\n";
+	    my $limit_in_kb = $limitline / 1024;
+	    print "Docker limit_in_kb =  $limit_in_kb but ignoring\n";
+	    # In openshift.json, notice how PostgreSQL and Solr have
+	    # resources.limits.memory set to "256Mi".
+	    # If you try to give the Dataverse/Glassfish container twice
+	    # as much memory (512 MB) and allow $sys_mem_total to
+	    # be set below, you should see the following:
+	    # "Setting the heap limit for Glassfish to 192MB."
+	    # FIXME: dataverse.war will not deploy with only 512 GB of memory.
+	    # Again, the goal is 1 GB total (512MB + 256MB + 256MB) for
+	    # Glassfish, PostgreSQL, and Solr to fit in the free OpenShift tier.
+	    #print "setting sys_mem_total to: $limit_in_kb\n";
+	    #$sys_mem_total = $limit_in_kb;
+	}
+        close CGROUPMEM;
+    }
 }
 elsif ( -x "/usr/sbin/sysctl" ) {
     # MacOS X, probably...