summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <happydooby@gmail.com>2019-05-14 12:05:43 -0700
committerDessalines <happydooby@gmail.com>2019-05-14 12:05:43 -0700
commit69c8d663bef6c16195f864cd9a1595c1c293743a (patch)
tree5aee9a438fb48512e7a924a7c1b5bbc6af514181
parent8d4ed4de399a2cd699b31dc0d7517ec85992a4ed (diff)
Adding a docker image.
- Instructions added to readme for how to use the simpler small image too. Fixes #101.
-rw-r--r--README.md10
-rw-r--r--docker/docker-compose.yml28
2 files changed, 38 insertions, 0 deletions
diff --git a/README.md b/README.md
index 5ebb969d..e87f54c4 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,16 @@ 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
./docker_update.sh # This pulls the newest version, builds and runs it
```
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 00000000..4f5d51a9
--- /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