Commit Graph

Select branches

Hide Pull Requests

arguments_any_order

dev

development-v6

master

v6/additional_command

v6/hard-fail

v6/local-build-FTL

v6/printenv

v6/service-wrapper

v6/tini

#1

#100

#100

#1003

#1005

#1006

#1009

#101

#101

#1013

#1014

#102

#1022

#1023

#1024

#1025

#1027

#1028

#1029

#103

#1030

#1032

#1033

#1034

#1038

#104

#1041

#1044

#1045

#1049

#1050

#1051

#1056

#1057

#1058

#1059

#106

#1060

#1064

#1065

#1066

#1067

#1071

#1074

#1076

#1079

#1080

#1081

#1082

#1083

#1084

#1086

#1088

#1089

#1090

#1091

#1092

#11

#1101

#1102

#1104

#1105

#1106

#111

#1110

#1111

#1112

#1115

#1117

#1121

#1122

#1123

#1124

#1125

#1126

#1127

#1128

#1129

#1130

#1131

#1132

#1133

#1135

#1136

#1138

#114

#1140

#1141

#1142

#1147

#1148

#115

#1150

#1151

#1152

#1154

#1155

#1156

#1157

#1158

#1159

#1160

#1161

#1164

#1168

#1169

#1170

#1172

#1173

#1178

#1179

#1180

#1181

#1182

#1183

#1185

#1191

#1192

#1193

#1198

#1200

#1202

#1203

#1204

#1210

#1212

#1214

#1215

#1216

#1219

#1225

#1226

#123

#1232

#1233

#1234

#1235

#1238

#124

#124

#1242

#1245

#1246

#1247

#1250

#1254

#1255

#1256

#1258

#1259

#126

#126

#1260

#1262

#1264

#1265

#1266

#1267

#1269

#1270

#1271

#1272

#1278

#128

#1281

#1282

#1283

#1284

#1285

#1286

#1287

#1288

#1290

#1291

#1292

#1293

#1296

#1297

#1298

#13

#130

#1300

#1301

#1302

#1303

#1304

#1306

#1307

#1308

#1309

#1313

#1317

#1319

#132

#132

#1320

#1326

#133

#1331

#1335

#1336

#1338

#1339

#134

#1340

#1342

#1344

#1345

#1350

#1352

#1353

#1354

#1356

#1357

#1361

#1366

#1367

#1368

#1370

#1371

#1372

#1373

#1374

#1375

#1376

#1377

#1378

#138

#1380

#1381

#1382

#1383

#1384

#1385

#1390

#1391

#1392

#1393

#1394

#1395

#1396

#14

#140

#1401

#1402

#1403

#1404

#1405

#1406

#1407

#1408

#1409

#1410

#1412

#1415

#1416

#1417

#142

#142

#1423

#1427

#1428

#1429

#1433

#1434

#1435

#1436

#1437

#1438

#1439

#1440

#1441

#1442

#1443

#1444

#1448

#1449

#1450

#1451

#1452

#1453

#1454

#1455

#1456

#1457

#1458

#1459

#1460

#1461

#1464

#1465

#1466

#1467

#1468

#1469

#1470

#1472

#1473

#1474

#1475

#1476

#1477

#1478

#1479

#1480

#1481

#1482

#1483

#1486

#1487

#1488

#1489

#149

#1490

#1491

#1492

#1494

#1495

#1497

#1498

#1499

#1500

#1501

#1502

#1503

#1504

#1505

#1506

#1508

#1510

#1511

#1512

#1513

#1514

#1515

#1516

#1517

#1518

#1519

#152

#1520

#1521

#1525

#1526

#1527

#1528

#1529

#1532

#1534

#1535

#1540

#1541

#1542

#1544

#1545

#1546

#1548

#1549

#155

#1551

#1552

#1553

#1554

#1555

#1556

#1557

#1558

#1559

#1563

#1565

#1566

#1567

#1568

#1569

#157

#1571

#1572

#1573

#1574

#1575

#1576

#1579

#1580

#1581

#1581

#1582

#1583

#1584

#1585

#1586

#1587

#1588

#1589

#159

#1590

#1591

#1592

#1593

#1594

#1595

#1595

#1596

#1597

#1598

#1599

#16

#16

#160

#1600

#1601

#161

#166

#167

#169

#17

#170

#172

#173

#174

#175

#176

#18

#181

#184

#186

#187

#188

#191

#192

#194

#20

#203

#204

#209

#21

#210

#210

#211

#212

#213

#214

#215

#216

#22

#221

#221

#222

#227

#233

#234

#235

#237

#24

#240

#246

#253

#254

#256

#258

#263

#266

#269

#27

#270

#28

#28

#285

#287

#288

#289

#289

#29

#290

#293

#296

#30

#300

#302

#304

#307

#31

#314

#317

#32

#322

#33

#332

#334

#338

#339

#34

#343

#347

#349

#350

#351

#358

#359

#36

#360

#370

#372

#373

#374

#377

#38

#380

#383

#384

#386

#389

#39

#390

#394

#395

#40

#402

#41

#411

#412

#413

#415

#417

#418

#42

#420

#426

#440

#442

#447

#45

#451

#453

#454

#46

#461

#462

#463

#47

#472

#478

#48

#480

#481

#487

#492

#493

#494

#498

#499

#500

#501

#504

#506

#511

#512

#513

#515

#52

#524

#53

#532

#533

#534

#54

#542

#543

#550

#551

#552

#554

#56

#562

#564

#565

#569

#57

#574

#575

#576

#577

#578

#579

#58

#581

#582

#584

#59

#59

#594

#599

#607

#608

#61

#611

#615

#618

#62

#621

#626

#628

#629

#631

#632

#634

#635

#64

#644

#649

#653

#657

#658

#66

#661

#663

#67

#672

#674

#675

#676

#68

#681

#683

#688

#689

#690

#7

#70

#701

#703

#704

#705

#706

#707

#71

#711

#712

#714

#716

#717

#721

#722

#725

#727

#729

#73

#731

#736

#737

#738

#739

#740

#741

#743

#745

#748

#754

#757

#758

#760

#761

#765

#767

#769

#77

#771

#774

#776

#777

#782

#786

#787

#790

#792

#793

#796

#797

#798

#8

#800

#802

#803

#806

#807

#808

#816

#818

#82

#820

#823

#825

#826

#828

#83

#830

#831

#832

#833

#836

#837

#839

#84

#840

#842

#843

#845

#846

#847

#848

#849

#850

#852

#853

#856

#857

#861

#865

#866

#867

#869

#87

#870

#872

#873

#875

#876

#879

#880

#881

#882

#883

#884

#885

#886

#888

#889

#89

#890

#891

#892

#893

#894

#897

#898

#899

#9

#901

#902

#905

#906

#907

#908

#909

#91

#916

#917

#921

#928

#930

#939

#940

#941

#942

#944

#946

#949

#95

#957

#96

#964

#965

#966

#967

#970

#973

#976

#977

#978

#981

#982

#985

#987

#988

#990

#991

#992

#993

#993

#994

#995

#996

#997

#998

#999

2021.09

2021.10

2021.10.1

2021.11

2021.12

2021.12.1

2022.01

2022.01.1

2022.01.2

2022.02

2022.02.1

2022.04

2022.04.1

2022.04.2

2022.04.2beta

2022.04.3

2022.05

2022.07

2022.07.1

2022.08

2022.08.1

2022.08.2

2022.08.3

2022.09

2022.09.1

2022.09.2

2022.09.3

2022.09.4

2022.10

2022.11

2022.11.1

2022.11.2

2022.12

2022.12.1

2023.01

2023.01.1

2023.01.10

2023.01.2

2023.01.3

2023.01.4

2023.01.5

2023.01.6

2023.01.8

2023.01.9

2023.02.0

2023.02.1

2023.02.2

2023.03.0

2023.03.1

2023.05.0

2023.05.1

2023.05.2

2023.10.0

2023.11.0

2024.01.0

2024.02.0

2024.02.1

2024.02.2

2024.03.0

2024.03.1

2024.03.2

2024.05.0

2024.06.0

ph-2.9.4_admin-1.4.3.1

ph-2.9.5_admin-1.4.4.2

pi-2.5.3_admin-1.1.4

pi-2.6.2_admin-1.2

pi-2.6.3_admin-1.2

pi-2.7.1_admin-dev

pi-2.7_admin-1.3

pi-2.8.1_admin-1.4

pi-2.8.1_admin-dev

pi-2.9.1_admin-1.4

pi-2.9.1_admin-1.4.1

pi-2.9.1_admin-1.4.2

pi-2.9.2_admin-1.4.2

pi-2.9_admin-1.4

v2.11.2

v2.12.1

v2.12.1-2

v2.13.1

v2.13.1-1

v2.13.2

v3.0.1

v3.1

v3.1.4

v3.2.1

v3.3

v3.3.1

v3.3.1-1

v4.0

v4.1.1

v4.2

v4.2.2

v4.2.2-1

v4.3

v4.3.1

v4.3.1-3

v4.3.1-4

v4.4

v5.0

v5.1.1

v5.1.2

v5.2

v5.2.1

v5.2.2

v5.3.4

v5.4

v5.5

v5.5.1

v5.6

v5.7

v5.8

v5.8.1

vTestTag

Mono Color

• 8872c2b393
  Fix config filename on the test RD WebDesign 2023-01-15 17:50:28 -0300
• a58b1c08bd Change `PHP_ENV_CONFIG` and `setup_web_php_env()` RD WebDesign 2023-01-04 22:15:06 -0300
• 16149d768a
  Merge pull request #1270 from pi-hole/master Adam Warner 2023-01-15 17:46:12 +0000
• a00410a4ae
  Merge pull request #1265 from pi-hole/action_close_stale_pr Adam Warner 2023-01-15 17:44:44 +0000
• 94a6ed33c5
  Add a workflow to build v6-pre-alpha container nightly/on push to that branch Adam Warner 2023-01-14 16:40:43 +0000
• 0fc9505643 More detailed comments RD WebDesign 2023-01-06 18:48:23 -0300
• 2771a17148 Add action to close stale PR RD WebDesign 2022-12-30 18:00:32 -0300
• 99350c2327
  Enable colors for pytest output. This certainly works locally, not sure if it will work on GHA... One way to find out. Adam Warner 2023-01-06 18:57:45 +0000
• b723874623
  Don't need to see all the images on the system Adam Warner 2023-01-06 18:57:09 +0000
• 67d00f3b38
  Merge pull request #1267 from pi-hole/master Adam Warner 2023-01-03 19:46:50 +0000
• 203f6f4ea3
  Merge pull request #1260 from yubiuser/be_honest Adam Warner 2023-01-02 19:04:25 +0000
• 7eab50ce29
  Merge pull request #1259 from pi-hole/master Adam Warner 2023-01-02 19:03:31 +0000
• 3fe6b9e750
  Add a clarifyier to docker compose command, remove the -f, as it is not needed Adam Warner 2023-01-02 19:00:41 +0000
• 6ac545a95a
  Update README.md James Milne 2023-01-02 20:04:03 +0200
• 8be93af864
  Fixed command syntax in README.md zleyyij 2022-12-28 15:53:18 -0700
• 3eb38a297e
  Merge pull request #1262 from pi-hole/dependabot/github_actions/dev/actions/stale-7 Adam Warner 2022-12-27 12:27:45 +0000
• 62e3af4e60
  Bump actions/stale from 6 to 7 dependabot[bot] 2022-12-24 10:00:34 +0000
• a4b5122e3e
  Shorten no merge conflict message Christian König 2022-12-22 22:29:09 +0100
• fa0fb82477
  Merge pull request #1258 from pi-hole/dev 2022.12.1 2022.12 Adam Warner 2022-12-21 21:43:05 +0000
• 842f4eb6c2
  Merge pull request #1255 from yubiuser/merge_conflict Adam Warner 2022-12-19 20:48:52 +0000
• d52df6dfb2
  Merge pull request #1256 from pi-hole/master Adam Warner 2022-12-15 22:34:41 +0000
• 6566662bc3
  Merge pull request #1254 from yubiuser/sync_back Adam Warner 2022-12-15 21:10:50 +0000
• e734f1fbce
  Add merge conflict workflow Christian König 2022-12-15 21:54:27 +0100
• 6ed70c21a0
  Use github cli to sync master back to development Christian König 2022-12-15 21:46:58 +0100
• ae4271e80d
  Merge pull request #1105 from pi-hole/ADD_PADD Adam Warner 2022-12-11 16:18:54 +0000
• f20a0d448c
  Add to /usr/local/bin and drop the .sh. Can now be called with `padd` Adam Warner 2022-12-11 16:16:29 +0000
• 806829a1b1
  add padd to .codespellignore. Adam Warner 2022-12-11 15:51:43 +0000
• fbef9727c1
  Update Dockerfile Adam Warner 2022-12-11 11:27:54 +0000
• 201303a56a
  ADD padd.sh to the container root Adam Warner 2022-05-26 20:42:59 +0100
• 1fe6506e4f
  Merge pull request #1247 from pi-hole/tweak/ftlrun Adam Warner 2022-12-10 16:48:15 +0000
• 2affe3c9cf
  Merge pull request #1250 from pi-hole/PromoFaux-patch-1 Adam Warner 2022-12-10 16:47:25 +0000
• ad36316060
  Merge branch 'dev' into PromoFaux-patch-1 Adam Warner 2022-11-30 22:40:26 +0000
• 41ac2b3aa8
  Update README to explain the version numbers slightly more accurately Adam Warner 2022-11-30 22:38:31 +0000
• a0421789cc
  CAP_STR will always be empty, since 776bac7b moved the calculation of that variable back out to bash_functions.sh Adam Warner 2022-11-27 22:35:31 +0000
• 7b80d7de66
  Merge pull request #1246 from pi-hole/master Adam Warner 2022-11-27 21:48:26 +0000
• a787e29aad
  Merge pull request #1245 from pi-hole/dev 2022.11.2 Adam Warner 2022-11-27 21:46:10 +0000
• 8aa6623844
  Merge pull request #1242 from th0r88/patch-1 Adam Warner 2022-11-21 07:12:18 +0000
• 91a174f976
  Added the right public port for pihole config Jan Ferme 2022-11-21 01:00:18 +0100
• e8677080ea
  Fix command example to be docker-compose Phil Verghese 2022-11-16 15:58:56 -0800
• 652bcfbe04
  Added Dockerfile for local usage. SamTV12345 2022-11-09 21:06:03 +0100
• 41aa699aab
  Merge pull request #1234 from pi-hole/updatechecktiming 2022.11.1 2022.11 Adam Warner 2022-11-09 18:03:53 +0000
• f73c92d03b
  rename _gravityonboot service/script to _postFTL and move updatecheck/version output to this script Adam Warner 2022-11-09 17:51:07 +0000
• 1f69a1ab83
  Merge pull request #1232 from davidgatti/patch-1 Adam Warner 2022-11-08 12:17:02 +0000
• 7f8862d73f
  Added -d option for detach. David Gatti 2022-11-05 14:39:27 +0100
• 069a88b7d1
  Update README.md David Gatti 2022-11-05 08:50:04 +0100
• b9f3aada94
  Merge pull request #1225 from pi-hole/dev 2022.10 Adam Warner 2022-10-10 22:02:18 +0100
• dc4071f9a4
  Merge pull request #1219 from juliohurtado/patch-1 Adam Warner 2022-10-06 19:11:45 +0100
• 1f3ced8d31
  Merge branch 'dev' into patch-1 Julio Hurtado Gómez 2022-10-06 16:23:47 +0200
• 47fe743548
  Delete duplicate "that" Julio Hurtado Gómez 2022-10-04 10:14:30 +0200
• e4a7a11b88
  Merge pull request #1216 from pi-hole/ftl-port-file-removal Adam Warner 2022-09-24 15:18:33 +0100
• 658f6de774
  FTL.port file is deprecated (see https://github.com/pi-hole/FTL/pull/1445) Adam Warner 2022-09-24 15:11:27 +0100
• fc8a679521
  Merge pull request #1215 from pi-hole/dependabot/github_actions/dev/actions/stale-6 Adam Warner 2022-09-24 13:10:02 +0100
• 4f9b854546
  Bump actions/stale from 5 to 6 dependabot[bot] 2022-09-24 10:06:36 +0000
• 1eff43b6b7
  Merge pull request #1214 from danitorregrosa/dev Adam Warner 2022-09-22 22:19:31 +0100
• 913f11beb5
  S6_ARCH fix for rpi1 danitorregrosa 2022-09-22 22:55:21 +0200
• 71d77b5fe8
  Merge pull request #1212 from pi-hole/refactor-some-more Adam Warner 2022-09-20 09:16:07 +0100
• f94fb54a18
  Some of these should not be user overridable Adam Warner 2022-09-19 21:46:46 +0100
• a9ecd4e7a2
  Merge pull request #1210 from lightswitch05/feature/cleanup-tests-and-test-dependencies 2022.09.4 Adam Warner 2022-09-18 11:58:12 +0100
• 4da66313f4
  Remove old test dependencies, updated ones still being used. Introduce Black formatter Daniel 2022-09-17 04:28:01 +0000
• 2164220c69
  Merge pull request #1204 from willman42/dev 2022.09.3 Adam Warner 2022-09-14 21:39:00 +0100
• 798c0e606f init commit of Pi-hole behind Caddy example William Trelawny 2022-09-05 09:57:54 -0400
• 4ddb2f817d
  Merge pull request #1203 from pi-hole/master Adam Warner 2022-09-05 12:47:15 +0100
• 988c39581e
  Merge pull request #1202 from pi-hole/dev 2022.09.2 Adam Warner 2022-09-05 12:28:05 +0100
• 2f2395e5c0
  Merge pull request #1200 from willman42/dev Adam Warner 2022-09-05 12:27:46 +0100
• 0b9e9a5af6 fixed broken link to TESTING.md William Trelawny (willman42) 2022-09-03 18:35:43 -0400
• 4a636fb7ba
  Merge pull request #1198 from labodj/master Adam Warner 2022-09-03 08:43:57 +0100
• 540ca1e31f Remove the email function LaboDJ 2022-09-03 04:48:11 +0200
• f044e58b5c
  Calrifications to experimental uid/gid changer variables Adam Warner 2022-09-02 23:56:17 +0100
• 0d5a001916
  also run remote update check on container startup 2022.09.1 Adam Warner 2022-09-02 21:37:10 +0100
• 9d17bd9871
  Update documentation per comments on #1155 2022.09 Adam Warner 2022-09-02 18:14:10 +0100
• de80425c87
  Merge pull request #1168 from freddydumont/patch-1 Adam Warner 2022-09-02 18:09:56 +0100
• b18d9bd419
  Merge pull request #1193 from pi-hole/dnsmasq-listening 2022.08.3 Adam Warner 2022-08-29 17:16:32 +0100
• 0bbdd15073
  Set FTL/DNSMASQ listening behaviour per variable if it is passed. Fixes #1188 Adam Warner 2022-08-29 17:12:58 +0100
• a4c931f115
  Merge pull request #1192 from pi-hole/s6-wait-maxtime Adam Warner 2022-08-29 16:52:00 +0100
• efd587bdd1
  Read CAP_STR into an array and output one cap per line in startup Adam Warner 2022-08-29 16:49:16 +0100
• 27980ed9cf
  Prevent S6 timeouts on container start by setting S6_CMD_WAIT_FOR_SERVICES_MAXTIME to 0, per https://github.com/just-containers/s6-overlay/issues/452 Adam Warner 2022-08-29 16:33:41 +0100
• 10c33ed871
  Add note to readme about installingon Dokku, closes #1190 Adam Warner 2022-08-29 14:32:14 +0100
• 14c67ed729
  capabilites ==> capabilities Adam Warner 2022-08-29 13:22:50 +0100
• 69f64b963e
  Merge pull request #1191 from pi-hole/s6-tweaks Adam Warner 2022-08-29 13:18:49 +0100
• 97f81bae21
  Shuffle some files around, change dependencies to make output clearer, change ::: for [i] to further clarify output. Allow for PH_VERBOSE to set -x on all scripts that it would be useful for Adam Warner 2022-08-29 13:17:22 +0100
• 2b60df6d2b
  Move uid/gid changer from legacy to new style. Move deprecated dependencies file to dependencies.d for all services. Make cron depend on base Adam Warner 2022-08-29 12:20:10 +0100
• 473117e8a8
  Rename start and gravity scripts to match their service names Adam Warner 2022-08-29 11:50:19 +0100
• e6d4c3091f
  Move all scripts to /usr/local/bin to simplify dockerfile Adam Warner 2022-08-29 11:48:07 +0100
• 55f4f89a0c
  remove some no-longer-referenced files Adam Warner 2022-08-29 11:37:42 +0100
• faffe6430f
  Remove the 01-resolver-resolv file - can't track down what it does from looking at commit history - functionality is deprecated Adam Warner 2022-08-29 11:21:29 +0100
• 48c6192617
  reintroduce ability to set verbose output Adam Warner 2022-08-29 10:38:04 +0100
• 9d0162ebcc
  Merge pull request #1185 from pi-hole/tweak/PIHOLE_DNS_ARR Adam Warner 2022-08-27 08:16:08 +0100
• 939a69b895
  Test for empty values in the PIHOLE_DNS_ array, skip if it's empty Adam Warner 2022-08-26 22:40:15 +0100
• 1daeb117cb
  Merge pull request #1183 from pi-hole/master Adam Warner 2022-08-26 22:45:52 +0100
• 9039a73272
  Merge pull request #1182 from pi-hole/dev 2022.08.2 Adam Warner 2022-08-26 00:23:17 +0100
• cbd86caa5b
  Merge pull request #1170 from pi-hole/dependabot/pip/urllib3-1.26.5 Adam Warner 2022-08-25 21:50:26 +0100
• 471e0425c6
  Merge pull request #1181 from pi-hole/fix-podman-issues Adam Warner 2022-08-25 21:50:09 +0100
• 8619de0031
  Revert change that removed the moving of /init to /s6-init. Add comments to make sure it does not get removed again Adam Warner 2022-08-25 19:27:24 +0100
• a7c7be01c1
  Merge pull request #1180 from pi-hole/master Adam Warner 2022-08-25 16:13:51 +0100
• 4241e50d4f
  Merge pull request #1179 from pi-hole/dev 2022.08.1 Adam Warner 2022-08-25 13:41:39 +0100
• 6baa4f9f08
  Merge pull request #1178 from pi-hole/master Adam Warner 2022-08-25 13:40:09 +0100
• c89a55c72e
  Update dependabot.yml Adam Warner 2022-08-24 21:41:56 +0100
• 776bac7b90
  [Experimental] Move the capability setting back to bash_functions from the pihole-FTL service Adam Warner 2022-08-24 21:27:38 +0100
• 7ac0e8f0e3
  Merge pull request #1173 from pi-hole/update-docs Adam Warner 2022-08-23 19:02:28 +0100
• a1f9601c89
  Merge branch 'dev' into update-docs Adam Warner 2022-08-22 21:46:12 +0100