From 515fc86fd01f6db841052ca57f4cdce7be412985 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Tue, 14 May 2019 12:05:43 -0700
Subject: [PATCH] Adding a docker image.

- Instructions added to readme for how to use the simpler small image
too. Fixes #101.
---
 README.md                 | 10 ++++++++++
 docker/docker-compose.yml | 28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 docker/docker-compose.yml

diff --git a/README.md b/README.md
index 5ebb969d6..e87f54c49 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,16 @@ Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Infern
 ### Docker
 Make sure you have both docker and docker-compose installed.
 
+```
+git clone https://github.com/dessalines/lemmy
+cd lemmy/docker
+docker-compose up -d
+```
+
+and goto http://localhost:8536
+## Develop
+### Docker Development
+
 ```
 git clone https://github.com/dessalines/lemmy
 cd lemmy
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 000000000..4f5d51a92
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '2.4'
+
+services:
+  db:
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_USER: rrr
+      POSTGRES_PASSWORD: rrr
+      POSTGRES_DB: rrr
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U rrr"]
+      interval: 5s
+      timeout: 5s
+      retries: 20
+  lemmy:
+    image: dessalines/lemmy:latest
+    ports:
+      - "8536:8536"
+    environment:
+      LEMMY_FRONT_END_DIR: /app/dist
+      DATABASE_URL: postgres://rrr:rrr@db:5432/rrr
+      JWT_SECRET: changeme
+      HOSTNAME: rrr
+    restart: always
+    depends_on: 
+      db: 
+        condition: service_healthy