]> Untitled Git - lemmy.git/commitdiff
Some README updates.
authorDessalines <tyhou13@gmx.com>
Thu, 22 Aug 2019 04:09:46 +0000 (21:09 -0700)
committerDessalines <tyhou13@gmx.com>
Thu, 22 Aug 2019 04:09:46 +0000 (21:09 -0700)
README.md
docker/dev/docker_update.sh [new file with mode: 0755]
docker/docker_update.sh [deleted file]

index 2b0e8042b17f0d97df30ec1a9b321b03d87ff3fc..915df5e87c3c1dd590046827bbbf8ef2a18f725d 100644 (file)
--- 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 (executable)
index 0000000..9d0f454
--- /dev/null
@@ -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 (executable)
index 1758f73..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-docker-compose -f dev/docker-compose.yml up -d --no-deps --build