diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..d56dc21
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+/docker/data
diff --git a/.gitignore b/.gitignore
index 74dfbc7..356d76a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+/config/credentials/*.key
 
 /public/packs
 /public/packs-test
@@ -43,3 +44,6 @@ db/schema.rb
 
 .env*
 !.env.sample
+
+docker/*
+!docker/.keep
diff --git a/README.md b/README.md
index 7db80e4..32560f0 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,7 @@
-# README
+# Development
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
+```
+docker-compose up -d
+bin/setup
+foreman start
+```
diff --git a/config/application.yml b/config/application.yml
index b328aba..a73510c 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -1,7 +1,9 @@
 DATABASE_URL: '<%= Rails.application.credentials.DATABASE_URL %>'
 DATABASE_URL_CDAO: '<%= Rails.application.credentials.DATABASE_URL_CDAO %>'
 
-# SOLR_URL: '<%= Rails.application.credentials.SOLR_URL %>'
+SOLR_URL: '<%= Rails.application.credentials.SOLR_URL %>'
+
+REDIS_URL: '<%= Rails.application.credentials.REDIS_URL %>'
 
 SENTRY_DSN: '<%= Rails.application.credentials.SENTRY_DSN %>'
 REPORT_URI_URL: '<%= Rails.application.credentials.REPORT_URI_URL %>'
@@ -9,8 +11,4 @@ SENTRY_JS_ENABLED: "<%= Rails.application.credentials.SENTRY_JS_ENABLED || true
 
 RECAPTCHA_ENABLED:  '<%= Rails.application.credentials.RECAPTCHA_ENABLED %>'
 
-RAILS_SERVE_STATIC_FILES: "true"
-
-REDIS_URL: "redis://redis:6379/1"
-
-SOLR_URL: "http://localhost:8983/solr/default"
+RAILS_SERVE_STATIC_FILES: '<%= Rails.application.credentials.RAILS_SERVE_STATIC_FILES || true %>'
diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc
deleted file mode 100644
index 5bccb90..0000000
--- a/config/credentials.yml.enc
+++ /dev/null
@@ -1 +0,0 @@
-2noQKHpiDYPS4nXl8J2I+RzaCP7PTISGp7yhSqW8QmCqbL3i168W9KjBI9HIBotpOqkvCjx7SBx0vTUxrRkjmG5STX6+81TkXw0FfmxTS3Fh7C6RBtY4rdFSwDsQ8g4lC62j1OHWOclbd42HDCxSgTJQzRWLRacfTuj8kuCnQPmVWBwF+AC23V1fD6sbBlH/nsEEsn9IBnLUooiCIFdLlz9i8SRZ2niJF4ziJYGJVRrZXTLavB5/sANXxZ8hotJzEIreq/wV2f0x1thgINItNpNkV0eP8BvyycVIGLwMWLuPC83llLi14yg/NTSuqftQvVUA/9OhiEBcaFCOT3DWDIVl/R2lBTrm3Tjnw8SL7KZtMN9P9M4Y89ef/u5lzWyCMp1yLij8aglWX4glW//swB3PF1LP/4xaitZaK+D//qDdbg7AC+GU8YIg60MSQjKKJ7bCsLnViTKtsu8jjOmfEH6gCT/l+vgIlUrVSP/CGY2yMNb74qxtlNap14253V+s9Bh4hIWdzkD4MKxYpRKLhcmKll/rxwvjW9qOnZi6ZmIrRLTDjYwH83z9GH7nlvd7qenxxRA63hSfdNFfxiXV6Ky74fAbvJXOIB8ZD4LzLcFvcFi2ZTAhZCrqXzDW3Bhk0sSHLTG6R4GtnYzny36WrBbLBtQf5vw3NzDbz4iOopFcBM/lsoF/RAWn/qaJ61sF+2tMuBWW3ehqcAKLcnaMH1NW6f1zJshT9ThS8cRAt9Gdyts6KoHouQZbDXNM7RO3MNNDutKaJv8yFAb6usWBSufAnVTw+hRK+KZMtxOzWvF27SiMeksVpN9ODwzA2lXgzaMhmeNyrfC1QdogcGzoC3xfn2C5Xo3BdR+LVH8P86ncUcrIyHsUJCXjYgwWIMCzMUSSfh8ib1gLFNkWiaePi7vprHdZEogYi9BknhUfSQpbM79JNJxgus5D+/lCsOkOkR54hbGhl3bEkQpMGiSrXSXUyipyD7vLbrjITei9hNIFTDoTDICe468hR7CmvNYqNcxG6nJl0pB9ZL08rRZHCDT5xXWDbRfRq5Gl1IOQDQyaW0datYn/FoxPtQnnjcJOhjduBrrEdAW6pLaqaBI82J/rYYv5KJbgF/BXRQIeaLWlT4CinAOk7MY7ptUExDv8YljoM7QcVPOuxmhhlQxoEFKZV8dKzJsXU4/erlqqCBwOzg==--vOuu/RZX5q834IDZ--0G+z6p3mgrCzG7hFnOwuew==
\ No newline at end of file
diff --git a/config/credentials/development.yml.enc b/config/credentials/development.yml.enc
new file mode 100644
index 0000000..14fdbf6
--- /dev/null
+++ b/config/credentials/development.yml.enc
@@ -0,0 +1 @@
+k26YtTX/JTSRwZz4u5qF6/i2U7Sts2QZp62c9HNja9jaCA9H+ES/PkvCguJ/aavieJqpKNdQ8C/eiBZPTHfkQrPNCbv6ztALK9tg8VBifCwo5OAutAr/tYQ7HiykQWkU0syXWehafxx5e8IJ12WpP130V9J5XvxCA58pijVjU+810ATvBgTwTl+cfjs1GpovQFeLhEXNaKzaxRcfuRNOPLq4WJ0TQ5bAeZuSo40Sx8FL3Tx/j7TPMGD47YjePIyi4I9XEzxELTkBdoRv2nfWpZ1Ade0nLtaX7U96KpKR46LkGyIwaNDqIykT8h36sMUJUrmJSzCY9iTlIT+wXt1PVDGuun1sK5NuA3dFZ66xm1n/GR0WXS7O0Nj8zmPBud6kZpA21iYSJDV2EslSm+09vth1kG3CvzXoP3nQnmq2EYpR2KykrxRNZciL9qkDWcYtMM3MgQgH5Md/2eo+afIGgMnTHpbLWZKW+KlQ5n9HEtCDTMwHIu/hrRa0IRFJFuPP0WrZqmZyAYoDLFrC2ct61wLXNjw0ty6kC9/VbKDruPuEZQZKxcLwM7q8j61b/67f3PCCdc3LQ62c0Cj6ee7vgGKqzV0Bv/Tgz1o3J8Tg7O952Z44wWQ2eyZHzmz7wG5+xk3yYf5p1c9PHa5G3+6XfQP9Q1eMQPfTEQsb6GQeG7G2t0OJs9rYEwhI9PtfIF3EUAmORsfBznbXNWsuchG2zOViDsq3iEBmW+3foewpWQZ11gnz+DV9BTyrbpBsZk8LEMgiRho2YKK0F8zREaJ96VubX0rxDRdI5YPFP0mcXiBs83CoKW8CgHhb--ObRYoWt2iH3wY4Yl--wJJvsuj3UudObCM5DwFbQw==
\ No newline at end of file
diff --git a/config/credentials/production.yml.enc b/config/credentials/production.yml.enc
new file mode 100644
index 0000000..bd20117
--- /dev/null
+++ b/config/credentials/production.yml.enc
@@ -0,0 +1 @@
+RHVE24irVZERt12NIvtMlOeD5gI2i1lkMewJJxBlAgGsXD8Ms55jNTcqKV0jUHk30xxq1wiDIfEfeCK//XwzSQtdhPkHUETFRMtKlmw0rqVTws9wVklbrmime5iDvuOf38vInbZVAcFU21s+zUf+Du42KMIGlVb3/dlIS2u2e1xw5KNJQOCIfKoe++H9bPOtFerhhDYUmRYJe+tMOQLyTUu0K+2ffg+a49ff35FKJqTpCPL5Vu3uD38pGtDhKhxCiUPwKFqpHP3i7gEi34QpzkaD3Vktu9pRtbiPxeqM8snxWBQsxgsRsdKJwOuEUoj2qw5oxHKhYI/jVaitBRvwYPZTtbrvSEym9D9roaI+DR8SHE39MAh1xU73sRTgrDz2o5FWPJoijdczI63j+AOza3ZbqfuDEagjqGdCDbXCfr3gi8d9GcM60gGBDkWhr1h0CxWV6jzLcU7yA8dTuSL8nFdd17zsN5C9ZgxxvUZ3ilnbOYPwdcZP0/9ekprq2cIQ58CaLsu69sixd2UnUwtyC4zx90FGhiA3kVFyJeahTbUOKL14RK6BhaMUuz15tz98HtCO+Is9uraWryPNVX2l6m/Q3wQfrOWai/8v8HKevqdmzMJvivAy5fPtsR2kJkvECPK0Io1a5IHv434gw5f7PcGzlGOEk3XArA7XxeyNmLK7wzGW74Topvi+Zqtk25JqE7Z4Nkkv4y4o4ctkvBRj2ExzZg21wQD9giLaANcb8Hj+sk0HNOgRbZ13aOepHiJX2lMGsS7x2PBpk56B3qMogxrEbdNgQdxXXBtW1HNeyc+z9kZRgsHyRxDDG+9glj9FdUmDBobbdxigvLaWAFIBCDIlKIH3Rtv/MAz/0lnE9PSPqn13QfC8KMyI3RzpNcR6NrKxZiLWMEy6Oex220hQOFfbepHLNkLIUm9IKqysdYwa32anKvyg34YQ6vE7XEEui1L4aKWNq2Vb7CSF1JreJSB21zW8FC5uSh3QD/AKPWAyF7reVIBIjW7VsApEL6R8s2ou0RBkIMyhtXyDDUOzez6GEu4caUeSNOCjp4vsSZwXEzBSOz0rzCVyJPMBGiIsaMGDZ02vbBwSVDVV/rhzCuVpBKEiMcjzDFc9QHwhD7gCy1mtvP6gQmWLUiDP9Y+8A6okKcxB6gDAKHzdJXGAJGYnktqGdHMYpQ0feE0N+umG7wyEaBW0YJAIQYR6KR8OSMy+6Rg43iQRXXiOgBcU0uIQa7JyVQdysQX4fhW1UZII4Syu65tfi75NETpqWbDxnp6xvw7LpQ==--a6ISTZpt8qbI/E2O--VsALKCGxTmuK5s0bBfOhog==
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 590e2c2..a785765 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,27 @@
 version: "3"
 services:
+  postgresql:
+    restart: always
+    image: sameersbn/postgresql:latest
+    environment:
+      - PG_PASSWORD=${PG_PASSWORD:-password0321}
+      - DB_NAME=${PG_DB_NAME:-cdao_pjet,cdasiaonline}
+    volumes:
+      - ./docker/data/postgresql:/var/lib/postgresql
+    ports:
+     - ${PG_PORT:-5432}:5432
   redis:
+    restart: always
     image: tenshiamd/redis:5-alpine
     command: redis-server
+    ports:
+     - ${REDIS_PORT:-6379}:6379
     volumes:
-      - redis-data:/var/lib/redis
+      - ./docker/data/redis:/var/lib/redis
   solr:
+    restart: always
     image: tenshiamd/solr:5-alpine
     ports:
       - ${SOLR_PORT:-8983}:8983
     volumes:
-      - solr-data:/var/lib/solr
-volumes:
-  redis-data:
-  solr-data:
+      - ./docker/data/solr:/var/lib/solr
diff --git a/docker/.keep b/docker/.keep
new file mode 100644
index 0000000..e69de29