Merge pull request #674 from pi-hole/master

Sync dev from master
pi-hole · Aug 22, 2020 · 52e819a · 52e819a
2 parents bba93de + 7199d93
commit 52e819a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 2 deletions.
diff --git 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:

diff --git 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
@@ -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/VERSION b/VERSION
@@ -1 +1 @@
-v5.1.1
+v5.1.2
diff --git a/docker-compose.yml → docker-compose.yml.example b/docker-compose.yml → docker-compose.yml.example
diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ on: @@
           - beta-v*
           - release/*
         tags:
+          - v*
       pull_request:
     #env:
@@ Expand Down @@