Skip to content

Commit 08856f5

Browse files
committed
Fix file sytle
Signed-off-by: yubiuser <github@yubiuser.dev>
1 parent 227fb7b commit 08856f5

13 files changed

Lines changed: 33 additions & 36 deletions

File tree

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ assignees: ''
1212

1313
<!-- IMPORTANT Complete the entire template please, the info gathered here is usually needed to debug issues anyway so it saves time in the long run. Incomplete/stock template issues may be closed -->
1414

15-
<!-- pick ONE: Bug,
16-
Feature Request,
17-
Run Issue (running Pi-hole container failing),
18-
Build Issue (Building image failing)
15+
<!-- pick ONE: Bug,
16+
Feature Request,
17+
Run Issue (running Pi-hole container failing),
18+
Build Issue (Building image failing)
1919
Enter in line below: -->
20-
This is a: **FILL ME IN**
20+
This is a: **FILL ME IN**
2121

2222

2323
## Details
2424
<!-- Provide a more detailed introduction to the issue or feature, try not to duplicate info from lower sections by reviewing the entire template first -->
2525

2626
## Related Issues
27-
- [ ] I have searched this repository/Pi-hole forums for existing issues and pull requests that look similar
27+
- [ ] I have searched this repository/Pi-hole forums for existing issues and pull requests that look similar
2828
<!-- Add links below! -->
2929

3030
<!------- FEATURE REQUESTS CAN STOP FILLING IN TEMPLATE HERE -------->
3131
<!------- ISSUES SHOULD FILL OUT REMAINDER OF TEMPLATE -------->
3232

33-
## How to reproduce the issue
33+
## How to reproduce the issue
3434

3535
1. Environment data
3636
* Operating System: **ENTER HERE** <!-- Debian, Ubuntu, Rasbian, etc -->
3737
* Hardware: <!-- PC, RasPi B/2B/3B/4B, Mac, Synology, QNAP, etc -->
3838
* Kernel Architecture: <!-- x86/amd64, ArmV7, ArmV8 32bit, ArmV8 64bit, etc -->
39-
* Docker Install Info and version:
39+
* Docker Install Info and version:
4040
- Software source: <!-- official docker-ce, OS provided package, Hypriot -->
4141
- Supplimentary Software: <!-- synology, portainer, etc -->
4242
* Hardware architecture: <!-- ARMv7, x86 -->

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ contact_links:
99
- name: Documentation
1010
url: https://docs.pi-hole.net
1111
about: Documentation and guides.
12-
12+

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
updates:
33
# Maintain dependencies for GitHub Actions
44
- package-ecosystem: "github-actions"
5-
directories:
5+
directories:
66
- "/"
77
schedule:
88
interval: "weekly"

.github/workflows/build-and-publish.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runner: ubuntu-24.04-arm
3434
- platform: linux/riscv64
3535
runner: ubuntu-24.04-arm
36-
36+
3737
steps:
3838
- name: Prepare name for digest up/download
3939
run: |
@@ -57,7 +57,7 @@ jobs:
5757
github-token: ${{ secrets.GITHUB_TOKEN }}
5858
images: |
5959
${{ env.dockerhub }}
60-
${{ env.ghcr }}
60+
${{ env.ghcr }}
6161
flavor: |
6262
latest=${{ startsWith(github.ref, 'refs/tags/') }}
6363
tags: |
@@ -95,10 +95,10 @@ jobs:
9595
context: ./src/
9696
platforms: ${{ matrix.platform }}
9797
build-args: |
98-
PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
98+
PIHOLE_DOCKER_TAG=${{ steps.meta.outputs.version }}
9999
FTL_BRANCH=${{ env.components_branch }}
100100
CORE_BRANCH=${{ env.components_branch }}
101-
WEB_BRANCH=${{ env.components_branch }}
101+
WEB_BRANCH=${{ env.components_branch }}
102102
PADD_BRANCH=${{ env.components_branch }}
103103
labels: ${{ steps.meta.outputs.labels }}
104104
outputs: |
@@ -142,7 +142,7 @@ jobs:
142142
path: /tmp/digests
143143
pattern: digests-*
144144
merge-multiple: true
145-
145+
146146
- name: Set up Docker Buildx
147147
uses: docker/setup-buildx-action@v3
148148

@@ -187,4 +187,4 @@ jobs:
187187
- name: Inspect images
188188
run: |
189189
docker buildx imagetools inspect ${{ env.dockerhub }}:${{ steps.meta.outputs.version }}
190-
docker buildx imagetools inspect ${{ env.ghcr }}:${{ steps.meta.outputs.version }}
190+
docker buildx imagetools inspect ${{ env.ghcr }}:${{ steps.meta.outputs.version }}

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/setup-python@v5.6.0
3535
with:
3636
python-version: "3.13"
37-
37+
3838
- name: Run black formatter
3939
run: |
4040
pip install black

.github/workflows/housekeeping.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
repository: ${{ github.repository }}
1616
untagged_only: true
1717
owner_type: org # or user
18-
except_untagged_multiplatform: true
18+
except_untagged_multiplatform: true

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ docker-compose.yml
1313
etc-dnsmasq.d/
1414
etc-pihole/
1515
var-log/
16+
.vscode/
17+
.pytest_cache/
1618

1719
# WIP/test stuff
1820
doco.yml
1921

2022
# Ignore FTL Binary if it exists
21-
src/pihole-FTL
23+
src/pihole-FTL

.vscode/settings.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ usage() {
55
echo "Usage: $0 [-l] [-f <ftl_branch>] [-c <core_branch>] [-w <web_branch>] [-t <tag>] [use_cache]"
66
echo "Options:"
77
echo " -f, --ftlbranch <branch> Specify FTL branch (cannot be used in conjunction with -l)"
8-
echo " -c, --corebranch <branch> Specify Core branch"
8+
echo " -c, --corebranch <branch> Specify Core branch"
99
echo " -w, --webbranch <branch> Specify Web branch"
1010
echo " -p, --paddbranch <branch> Specify PADD branch"
1111
echo " -t, --tag <tag> Specify Docker image tag (default: pihole:local)"
@@ -91,7 +91,7 @@ while [[ $# -gt 0 ]]; do
9191
DOCKER_BUILD_CMD+=" --build-arg CORE_BRANCH=$CORE_BRANCH"
9292
shift
9393
shift
94-
;;
94+
;;
9595
-w | --webbranch)
9696
WEB_BRANCH="$2"
9797
check_branch_exists "web" "$WEB_BRANCH" "$WEB_FORK"

examples/docker-compose-caddy-proxy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ services:
3434
# Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
3535
TZ: 'Europe/London'
3636
# Set a password to access the web interface. Not setting one will result in a random password being assigned
37-
FTLCONF_webserver_api_password: 'correct horse battery staple'
37+
FTLCONF_webserver_api_password: 'correct horse battery staple'
3838
# Volumes store your data between container upgrades
3939
volumes:
4040
# For persisting Pi-hole's databases and common configuration file
4141
- './etc-pihole:/etc/pihole'
4242
# Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most.
43-
#- './etc-dnsmasq.d:/etc/dnsmasq.d'
43+
#- './etc-dnsmasq.d:/etc/dnsmasq.d'
4444
cap_add:
4545
# See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
4646
# Required if you are using Pi-hole as your DHCP server, else not needed

0 commit comments

Comments
 (0)