diff --git a/compose/README.md b/compose/README.md
new file mode 100644
index 0000000..27b134a
--- /dev/null
+++ b/compose/README.md
@@ -0,0 +1,26 @@
+# Docker Compose Example for COmanage Registry 
+
+This is an example Docker Compose file to deploy COmanage
+Registry with the Shibboleth Native SP for Apache HTTP Server
+and a PostgreSQL database.
+
+See the individual image Dockerfile templates and README
+files for details on how to prepare the volumes and the
+necessary contents including the COmanage Registry 
+configuration and the Shibboleth SP configuration.
+
+Change the tag from `COMANAGE_REGISTRY_VERSION-shibboleth-sp`
+to `COMANAGE_REGISTRY_VERSION-basic-auth` to quickly deploy
+without the need for federation.
+
+## Deploy
+
+```
+docker-compose up
+```
+
+## Tear Down
+
+```
+docker-compose down
+```
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
new file mode 100644
index 0000000..6b7cc03
--- /dev/null
+++ b/compose/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '2.1'
+services:
+  comanage-registry:
+    image: sphericalcowgroup/comanage-registry:develop-shibboleth-sp
+    ports:
+     - "80:80"
+     - "443:443"
+    volumes:
+     - /opt/comanage-registry:/local
+     - /tmp/shibboleth2.xml:/etc/shibboleth/shibboleth2.xml
+    depends_on:
+      comanage-registry-database:
+        condition: service_healthy
+  comanage-registry-database:
+    image: sphericalcowgroup/comanage-registry-postgres
+    volumes:
+     - /tmp/postgres-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "psql", "-h", "comanage-registry-database", "-U", "postgres", "-c", "\\l"]
+      interval: 5s
+      timeout: 5s
+      retries: 3