From 512cde82ef4950bb0990adfea4f8b9657a2fe356 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 21 Aug 2019 21:09:46 -0700 Subject: [PATCH] Some README updates. --- README.md | 14 +++++++------- docker/dev/docker_update.sh | 2 ++ docker/docker_update.sh | 3 --- 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100755 docker/dev/docker_update.sh delete mode 100755 docker/docker_update.sh diff --git a/README.md b/README.md index 2b0e8042b..915df5e87 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ Made with [Rust](https://www.rust-lang.org), [Actix](https://actix.rs/), [Infern Make sure you have both docker and docker-compose(>=`1.24.0`) installed. -``` +```bash mkdir lemmy/ cd lemmy/ wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml @@ -81,7 +81,7 @@ and goto http://localhost:8536 [A sample nginx config](/docker/prod/nginx.conf), could be setup with: -``` +```bash wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/nginx.conf # Replace the {{ vars }} sudo mv nginx.conf /etc/nginx/sites-enabled/lemmy.conf @@ -106,10 +106,10 @@ ansible-playbook lemmy.yml ### Docker Development -``` +```bash git clone https://github.com/dessalines/lemmy -cd lemmy/docker -./docker_update.sh # This pulls the newest version, builds and runs it +cd lemmy/docker/dev +./docker_update.sh # This builds and runs it, updating for your changes ``` and goto http://localhost:8536 @@ -124,7 +124,7 @@ and goto http://localhost:8536 #### Set up Postgres DB -``` +```bash psql -c "create user lemmy with password 'password' superuser;" -U postgres psql -c 'create database lemmy with owner lemmy;' -U postgres export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy @@ -132,7 +132,7 @@ and goto http://localhost:8536 #### Running -``` +```bash git clone https://github.com/dessalines/lemmy cd lemmy ./install.sh diff --git a/docker/dev/docker_update.sh b/docker/dev/docker_update.sh new file mode 100755 index 000000000..9d0f45429 --- /dev/null +++ b/docker/dev/docker_update.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker-compose up -d --no-deps --build diff --git a/docker/docker_update.sh b/docker/docker_update.sh deleted file mode 100755 index 1758f7317..000000000 --- a/docker/docker_update.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -docker-compose -f dev/docker-compose.yml up -d --no-deps --build