From fda66e2f67d81d7cfd71131ddd15fa68ed3af928 Mon Sep 17 00:00:00 2001
From: Adam Hill <adam@diginc.us>
Date: Sun, 9 Aug 2020 17:31:46 -0500
Subject: [PATCH 1/4] Update VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 346d9ca..96f3123 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v5.1.1
+v5.1.2

From 41f109cf48bc83705bca095f7a6d1a093c57ed23 Mon Sep 17 00:00:00 2001
From: Adam Hill <adam@diginc.us>
Date: Sun, 9 Aug 2020 21:22:28 -0500
Subject: [PATCH 2/4] Bump web version

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 11fe442..7a10d34 100644
--- a/install.sh
+++ b/install.sh
@@ -4,7 +4,7 @@ mkdir -p /etc/pihole/
 mkdir -p /var/run/pihole
 # Production tags with valid web footers
 export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
-export WEB_VERSION="v5.1"
+export WEB_VERSION="v5.1.1"
 
 # Only use for pre-production / testing
 export CHECKOUT_BRANCHES=false

From daa3c1e45cbcd6e31529818a7c22c6636a7facd1 Mon Sep 17 00:00:00 2001
From: Adam Hill <adam@diginc.us>
Date: Sun, 9 Aug 2020 21:39:57 -0500
Subject: [PATCH 3/4] releases tags with ^v

---
 .github/workflows/test-and-build.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
index d25362e..24e7e7b 100644
--- a/.github/workflows/test-and-build.yaml
+++ b/.github/workflows/test-and-build.yaml
@@ -8,6 +8,7 @@ on:
       - beta-v*
       - release/*
     tags:
+      - v*
   pull_request:
 
 #env:

From 93b86c8981d5804546f2c4562d7af334ab2a3564 Mon Sep 17 00:00:00 2001
From: Felix Wong <felix@fawong.com>
Date: Thu, 16 Apr 2020 00:32:38 +0000
Subject: [PATCH 4/4] use docker-compose example yaml

Signed-off-by: Felix Wong <felix@fawong.com>
---
 .gitignore                                       | 4 ++++
 README.md                                        | 2 ++
 docker-compose.yml => docker-compose.yml.example | 0
 3 files changed, 6 insertions(+)
 rename docker-compose.yml => docker-compose.yml.example (100%)

diff --git a/.gitignore b/.gitignore
index 4e7bc94..e8f6ff4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,10 @@ UNKNOWN.egg-info
 .env
 ci-workspace
 .gh-workspace
+docker-compose.yml
+etc-dnsmasq.d/
+etc-pihole/
+var-log/
 
 # WIP/test stuff
 doco.yml
diff --git a/README.md b/README.md
index 9a05db6..e27a2c5 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
 
 ## Quick Start
 
+1. Copy docker-compose-example.yml to docker-compose.yml and update as needed. See example below:
 [Docker-compose](https://docs.docker.com/compose/install/) example:
 
 ```yaml
@@ -36,6 +37,7 @@ services:
       - NET_ADMIN
     restart: unless-stopped
 ```
+2. Run `docker-compose up --detach` to build and start pi-hole
 
 [Here is an equivalent docker run script](https://github.com/pi-hole/docker-pi-hole/blob/master/docker_run.sh).
 
diff --git a/docker-compose.yml b/docker-compose.yml.example
similarity index 100%
rename from docker-compose.yml
rename to docker-compose.yml.example