Commit Graph

Select branches

Hide Pull Requests

dependabot/pip/test/pip-cef70b0dd7

development

master

revert-1639-master

#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

#1596

#1597

#1598

#1599

#16

#16

#160

#1600

#1601

#1604

#1605

#1607

#1608

#1609

#161

#1611

#1612

#1615

#1616

#1620

#1621

#1624

#1626

#1628

#1629

#1632

#1633

#1634

#1635

#1636

#1637

#1638

#1639

#1640

#1641

#1643

#1644

#1645

#1646

#1647

#1648

#1649

#1651

#1652

#1655

#1659

#166

#1660

#1660

#1662

#1662

#1664

#1668

#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

2024.07.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

• 40386c8f05 Merge pull request #1644 from pi-hole/sanity-check-downloaded-FTL development Dominik 2024-11-22 18:37:36 +01:00
• 851b1f12a1 Bump aiohttp in /test in the pip group across 1 directory dependabot/pip/test/pip-cef70b0dd7 dependabot[bot] 2024-11-18 23:02:23 +00:00
• eb8b5af7dc Merge pull request #1659 from pi-hole/dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-5 yubiuser 2024-11-16 12:29:07 +01:00
• 7e0c93b03a Bump Chizkiyahu/delete-untagged-ghcr-action from 4 to 5 dependabot[bot] 2024-11-16 10:23:23 +00:00
• 4e1a66a757 Merge pull request #1646 from pi-hole/tweak/README_v6 RD WebDesign 2024-11-09 19:45:22 -03:00
• 8faa60a1ca Update README.md Adam Warner 2024-11-03 15:56:59 +00:00
• be8e292318 Improve BREAKING CHANGES text RD WebDesign 2024-10-28 16:07:00 -03:00
• f755a0220c Add a few punctuation marks and remove trailing spaces. RD WebDesign 2024-10-28 16:03:30 -03:00
• 3470a39e17 Merge pull request #1652 from pi-hole/dependabot/pip/test/development/black-24.10.0 yubiuser 2024-10-12 16:17:15 +02:00
• 8f376ea23e Bump black from 24.8.0 to 24.10.0 in /test dependabot[bot] 2024-10-12 10:53:39 +00:00
• e5277ce1b4 Merge pull request #1651 from pi-hole/tini-not-needed Adam Warner 2024-10-11 18:48:56 +01:00
• a070b944c4 Remove tini from image, we don't need it as we're handling all the exits etc in start.sh Adam Warner 2024-10-11 18:14:46 +01:00
• d762e9140c Merge pull request #1649 from pi-hole/terminate-with-FTL Adam Warner 2024-10-10 21:18:54 +01:00
• add6973a28 Monitor the capsh pid, not FTL pid. If stop is called without an exit code being passed to it, then FTL is still running - so we stop FTL and then get the exit code from the capsh PID by immediately waiting it after killing FTL Adam Warner 2024-10-09 18:38:10 +01:00
• f9b6999da1 Update src/start.sh Adam Warner 2024-10-07 23:10:23 +01:00
• 9e37aa8f59 Clean up the code - at the end of the start() function, wait for the start_ftl process and pass it's exit code to stop. Adam Warner 2024-10-07 21:47:58 +01:00
• 210a1172ff Always terminate the container if pihole-FTL binary exits. Either naturally or via an error. Don't attempt to restart it, allow the container's restart policy to do this. Adam Warner 2024-10-06 22:39:04 +01:00
• ba5d35dfae Merge branch 'development' into tweak/README_v6 RD WebDesign 2024-09-25 13:26:28 -03:00
• 89eb7f6b0d Correct the documentation for the TAIL_FTL_LOG variable Adam Warner 2024-09-25 15:28:01 +01:00
• 5f3b829dc5 Merge pull request #1648 from pi-hole/dependabot/pip/test/development/pytest-8.3.3 yubiuser 2024-09-14 12:52:36 +02:00
• 3070e68ca8 Bump pytest from 8.3.2 to 8.3.3 in /test dependabot[bot] 2024-09-14 10:50:57 +00:00
• c020a70d0c Merge pull request #1647 from IngmarStein/patch-1 yubiuser 2024-09-14 09:55:52 +02:00
• 39f5df9866 Update README.md Ingmar Stein 2024-09-14 09:49:48 +02:00
• a780403fa5 Tweak Readme text and formatting RD WebDesign 2024-09-13 16:29:42 -03:00
• ca7637decd Use the same logo and header used in web repo RD WebDesign 2024-09-13 16:04:04 -03:00
• 17279be549 Use a better format for the "BREAKING CHANGES" alert RD WebDesign 2024-09-13 16:02:36 -03:00
• 563179499c Add some hardening to the build script. Check if system has docker buildx installed. When using custom branches, check they actuall exist before proceeding with the build Adam Warner 2024-09-11 22:24:18 +01:00
• 4c058620bf Merge pull request #1645 from pi-hole/fix-tests Adam Warner 2024-09-13 18:43:17 +01:00
• af8863a156 Clean Shutdown test: Remove check for the "Shutting down..." line in FTL log as this is now only printed when debug logging is on Adam Warner 2024-09-13 18:23:14 +01:00
• 3454f65bb3 Merge pull request #1643 from pi-hole/sanity-check-downloaded-FTL Adam Warner 2024-09-11 21:11:17 +01:00
• e938d1a39b Actually do something with the result of readelf in case of invalid FTL binary Remove the cat of the pihole-FTL binary as it could lead to a very difficult to read logs Add some more helpful output to the build script Adam Warner 2024-09-11 18:54:47 +01:00
• 2823d1d1ce Merge pull request #1641 from pi-hole/migrage-dnsmasq-conf Adam Warner 2024-09-06 15:51:20 +01:00
• df97235946 Migrate the dnsmasq.d configs that are owned by Pi-hole into /etc/pihole/migration_backup_v6, where FTL expects to find them Adam Warner 2024-09-05 19:27:35 +01:00
• 01b9249eb2 Revert "Sync master back into development" revert-1639-master Adam Warner 2024-09-05 07:05:04 +01:00
• a5d4e0727f Merge pull request #1639 from pi-hole/master Adam Warner 2024-09-02 22:42:48 +01:00
• f9d305635d Merge branch 'development' into master Adam Warner 2024-09-02 22:42:38 +01:00
• 15085ce33e Merge pull request #1635 from pi-hole/dependabot/pip/test/development/pytest-xdist-3.6.1 yubiuser 2024-09-02 23:31:05 +02:00
• 8a2c70e961 Bump pytest-xdist from 3.5.0 to 3.6.1 in /test dependabot[bot] 2024-09-02 21:30:03 +00:00
• 1ae858253a Merge pull request #1637 from pi-hole/dependabot/pip/test/development/pytest-8.3.2 yubiuser 2024-09-02 23:29:07 +02:00
• 1a77fbdb81 Bump pytest from 7.4 to 8.3.2 in /test dependabot[bot] 2024-09-02 21:26:11 +00:00
• 98eb89d107 Merge pull request #1638 from pi-hole/dependabot/pip/test/development/pytest-testinfra-10.1.1 yubiuser 2024-09-02 23:25:24 +02:00
• adc64d0db5 Bump pytest-testinfra from 10.0.0 to 10.1.1 in /test dependabot[bot] 2024-09-02 21:23:36 +00:00
• a9a9a9a6ff Merge pull request #1636 from pi-hole/dependabot/pip/test/development/black-24.8.0 yubiuser 2024-09-02 23:22:49 +02:00
• a796a89d61 Merge branch 'development' into master Adam Warner 2024-09-02 22:19:00 +01:00
• 4cb3c3a16d Update branch name in sync-back-to-dev workflow master Adam Warner 2024-09-02 22:17:47 +01:00
• 34f6116c83 Bump black from 23.12.0 to 24.8.0 in /test dependabot[bot] 2024-09-02 21:16:07 +00:00
• f96fddda41 Merge pull request #1633 from pi-hole/sort-master-scheduled-build Adam Warner 2024-09-02 22:15:38 +01:00
• bd54136d08 update dependabot.yml to run against development not dev - remove v6 references Adam Warner 2024-09-02 22:09:55 +01:00
• fa5344e16c remove old build scripts from master (we wont use them again) and bring accross the v6 one so that the nightly image is built using the correct branches Adam Warner 2024-09-02 22:05:41 +01:00
• c38a6ea487 Merge pull request #1626 from pi-hole/development-v6 Adam Warner 2024-09-02 21:59:46 +01:00
• d00f17f169 Merge pull request #1632 from pi-hole/build-scripts-once-v6-in-dev Adam Warner 2024-09-02 21:57:57 +01:00
• 9e39ed34e0 Disbale arm64 testing for the time being Adam Warner 2024-09-02 21:55:43 +01:00
• 32c57752cf dev branch becomes development Default the component branches in Dockerfile to be development (might change to master after full v6 release) Adam Warner 2024-09-02 21:46:22 +01:00
• 7a33749f4e Set the flavor and tags in the metadata base on the current build yaml for v5 namely: - schedule = nightly - latest = only on tag/publish - else branch name (on dev) Adam Warner 2024-09-02 18:36:20 +01:00
• 26d0b85942 Quick rename (makes it easier to find in the required checks list) Adam Warner 2024-09-02 18:13:20 +01:00
• b012c809b1 Add src/pihole-FTL to .gitignore Adam Warner 2024-09-02 17:34:47 +01:00
• 442480448f Merge pull request #1629 from pi-hole/v6/migrate-v5-checks Adam Warner 2024-09-02 17:32:44 +01:00
• 5a9e67025b * Clean up some of the output for the container startup * Only start tailing pihole-FTL log from most recent pihole-FTL start * If v5 config files are detected, but no v6 files are, then we must defer some of the configuration until after FTL has migrated the files * move some of the logic from start into bash_functions to make it easier to follow the start Adam Warner 2024-08-25 18:35:57 +01:00
• bcc63933ae Merge pull request #1628 from pi-hole/default_tag Adam Warner 2024-08-25 13:51:42 +01:00
• 794ba9a552 Update Readme to reflect new local image tag name Adam Warner 2024-08-25 13:45:08 +01:00
• c0fa8de914 Set default tag for locally build images to pihole:local yubiuser 2024-08-25 11:51:13 +02:00
• 13798f0987 Merge branch 'dev' into development-v6 Adam Warner 2024-08-17 22:30:24 +01:00
• 353094cf43 correct directory for local FTL binary Adam Warner 2024-08-14 17:57:05 +01:00
• 1c7d276aa2 Merge pull request #1621 from pi-hole/update-alpine Adam Warner 2024-08-09 14:50:16 +01:00
• 953cee4019 No need to remember to update the python version yubiuser 2024-08-09 12:21:08 +02:00
• c0d822f35e Fix tests yubiuser 2024-08-07 21:45:19 +02:00
• 1c6c1b3075 bump alpine to 3.20 Adam Warner 2024-08-06 12:33:43 +01:00
• 6239412098 Merge pull request #1620 from pi-hole/dependabot/pip/test/dev/black-24.8.0 yubiuser 2024-08-03 13:42:05 +02:00
• 9a48b6daa1 Bump black from 24.4.2 to 24.8.0 in /test dependabot[bot] 2024-08-03 10:54:53 +00:00
• 6568baf40d Merge pull request #1615 from loeffelpan/dev Adam Warner 2024-07-28 18:29:10 +01:00
• 5e7d0b00c8 Merge pull request #1616 from pi-hole/dependabot/pip/test/dev/pytest-8.3.2 yubiuser 2024-07-27 13:42:54 +02:00
• 69da4b28f5 Bump pytest from 8.2.2 to 8.3.2 in /test dependabot[bot] 2024-07-27 10:10:28 +00:00
• 8354b1b3a6 Add DNSMASQ_LISTENING=bind to README.md loeffelpan 2024-07-27 00:21:55 +02:00
• bdd12787ce Merge pull request #1612 from pi-hole/master Adam Warner 2024-07-06 00:17:50 +01:00
• d4dd6b0a41 Merge pull request #1611 from pi-hole/dev Adam Warner 2024-07-05 22:40:52 +01:00
• a3633a1732 Merge pull request #1609 from pi-hole/pretty_fail yubiuser 2024-07-02 21:20:01 +02:00
• c26e71edfd Set column width to 120 Christian König 2024-07-02 08:20:47 +02:00
• 80bea32740 Add pytest-clarity to test environment to improve error log output Christian König 2024-07-01 21:00:20 +02:00
• e26f36620c Merge pull request #1608 from pi-hole/v6/default-upstream Adam Warner 2024-07-02 20:13:59 +01:00
• 2922fbdc42 Update src/bash_functions.sh Adam Warner 2024-07-02 20:02:15 +01:00
• 99f459e30f Using grep instead of tailing FTL.log as func.stdout only captures a few lines Christian König 2024-06-30 23:30:22 +02:00
• a7565e2b23 Default upstream DNS to Google and remove the mention of the environment variable from the quickstart compose file. Adam Warner 2024-06-30 21:14:45 +01:00
• c9a7c58dd3 Merge pull request #1604 from pi-hole/dependabot/github_actions/development-v6/docker/build-push-action-6 yubiuser 2024-06-24 20:11:20 +02:00
• f610db6d0c Bump docker/build-push-action from 5 to 6 dependabot[bot] 2024-06-24 18:08:50 +00:00
• 952096702c Merge pull request #1607 from pi-hole/tweaks Adam Warner 2024-06-24 19:07:39 +01:00
• d28c37e1e5 Remove entrypoint.sh as it is not needed Christian König 2024-06-24 18:17:24 +02:00
• d4836d2215 Merge pull request #1605 from pi-hole/dependabot/github_actions/dev/docker/build-push-action-6 Adam Warner 2024-06-22 12:50:09 +01:00
• 20145db333 silende JSONArgsRecommended warning in test build Adam Warner 2024-06-22 12:44:12 +01:00
• 425ecb39b8 Not sure how this ever worked, or why it has suddenly started causing issues if it did work. Adam Warner 2024-06-22 12:31:15 +01:00
• f9dd3dfa1d Add PADD branch switch to build script. Fix casing of as->AS in Dockerfile to silence a warning about casing Adam Warner 2024-06-22 12:21:28 +01:00
• 859e71b01e Bump docker/build-push-action from 5 to 6 dependabot[bot] 2024-06-22 10:42:34 +00:00
• fcacd2f71a Merge pull request #1601 from pi-hole/master Adam Warner 2024-06-16 10:31:08 +01:00
• 4149693092 Merge pull request #1600 from pi-hole/dev 2024.07.0 2024.06.0 Adam Warner 2024-06-16 10:26:21 +01:00
• f60e95838b Merge pull request #1599 from pi-hole/tweak/386-workaround Adam Warner 2024-06-15 17:53:58 +01:00
• eda9fdcf8d fall back to using dpkg when arch is detected as x86_64 to make sure we're not really on an i386 image to prevent wrong s6 overlay version being downloaded on a 32 bit image Adam Warner 2024-06-15 16:55:02 +01:00
• 56c110a2cc Merge pull request #1598 from alexis-opolka/master Adam Warner 2024-06-12 13:11:19 +01:00
• ecdaa43033 Update github user reference alexis-opolka 2024-06-12 03:25:36 +02:00
• b799ee35f5 Merge pull request #1597 from pi-hole/dependabot/pip/test/dev/pytest-8.2.2 yubiuser 2024-06-08 14:33:08 +02:00
• 13af8e5c60 Bump pytest from 8.2.1 to 8.2.2 in /test dependabot[bot] 2024-06-08 10:48:07 +00:00
• 80c829965b Merge pull request #1596 from pi-hole/new/ntp Dominik 2024-06-08 11:14:22 +02:00