Commit Graph

Select branches

Hide Pull Requests

goreman

main

proposed-changes-for-v2

refactor-template

#10

#10

#1011

#102

#1022

#1026

#1029

#1037

#1037

#106

#1069

#1071

#1073

#108

#1083

#1088

#1090

#1096

#1096

#11

#1100

#1100

#1106

#111

#1111

#1113

#1115

#1116

#1118

#1118

#1120

#1123

#1124

#1129

#1130

#1134

#1134

#1135

#1135

#1137

#1140

#1145

#1146

#1146

#1154

#1154

#1155

#1155

#1157

#1159

#1159

#1160

#1160

#1163

#1170

#1172

#1172

#1176

#1176

#1179

#118

#118

#1184

#1185

#1187

#1188

#119

#1193

#1194

#1197

#1198

#12

#1203

#1213

#1215

#1217

#1219

#1219

#1220

#1225

#123

#1230

#1234

#1235

#1235

#124

#1242

#1243

#1243

#1252

#1255

#1257

#1261

#1262

#1263

#1269

#1276

#1277

#1278

#1292

#1293

#1294

#1294

#1296

#1298

#13

#1301

#1302

#1306

#1307

#1308

#1308

#1313

#1318

#132

#132

#1322

#1323

#1326

#1326

#1328

#1332

#1336

#1337

#1338

#1342

#1342

#135

#1353

#1356

#136

#1366

#1369

#1369

#1373

#1379

#1386

#1388

#1393

#1396

#1399

#1402

#1405

#1405

#1407

#1409

#1417

#142

#1429

#1430

#1430

#1432

#1437

#1438

#1444

#1446

#1447

#1447

#145

#145

#1452

#1470

#1477

#1477

#1487

#1487

#1488

#1496

#1499

#1499

#15

#15

#1500

#1505

#1508

#1510

#1511

#1518

#1519

#152

#1532

#1532

#1538

#154

#1542

#155

#155

#1557

#1558

#1558

#156

#156

#1560

#1563

#1563

#1571

#1572

#1574

#1577

#1578

#1579

#1584

#1585

#1590

#1594

#1599

#1601

#1603

#1607

#1609

#161

#161

#1610

#1612

#1616

#1617

#1618

#1618

#1619

#1620

#163

#1641

#1644

#1644

#1649

#1653

#1659

#1662

#1667

#1679

#168

#1686

#1691

#1692

#1697

#1698

#1699

#170

#1708

#1714

#1718

#1719

#1720

#1721

#1722

#1723

#1724

#1725

#1726

#1731

#1736

#1737

#1737

#174

#1747

#1753

#1756

#1757

#1760

#1764

#1770

#1773

#1774

#1775

#1779

#1779

#178

#178

#1788

#1791

#1797

#1798

#1807

#1819

#1820

#1821

#183

#183

#1834

#1835

#1836

#1843

#1848

#185

#1853

#1856

#1857

#1858

#186

#1861

#1862

#1862

#1865

#1875

#1882

#1884

#1886

#1888

#1895

#19

#19

#1901

#1902

#1916

#1917

#192

#1925

#1927

#1928

#1929

#1931

#1933

#1934

#1938

#1938

#1939

#194

#1940

#1960

#1968

#1971

#1975

#1976

#1984

#1985

#1988

#1988

#1991

#1992

#1995

#1996

#1997

#2

#20

#20

#2002

#2002

#2004

#2008

#2011

#2011

#2012

#2014

#2016

#202

#2024

#2025

#2028

#2031

#2036

#2036

#2040

#2042

#2045

#2046

#2057

#2058

#206

#206

#2069

#2069

#2072

#2077

#2078

#2078

#2079

#2080

#2081

#209

#209

#2091

#2091

#21

#21

#2102

#2110

#2115

#2118

#2121

#2127

#2130

#2130

#2132

#2134

#2136

#2137

#2140

#2141

#2145

#2146

#2147

#215

#2151

#2152

#2153

#2155

#2157

#2159

#216

#216

#2162

#2163

#2164

#2173

#2175

#2179

#2183

#2184

#2186

#2187

#2188

#2191

#2197

#2197

#22

#22

#220

#2200

#223

#224

#225

#227

#227

#228

#23

#23

#230

#232

#232

#235

#240

#243

#243

#244

#244

#245

#245

#246

#248

#252

#254

#255

#255

#256

#257

#259

#259

#26

#260

#262

#264

#265

#271

#271

#272

#272

#273

#273

#276

#277

#28

#28

#283

#286

#286

#298

#299

#299

#30

#30

#300

#300

#31

#31

#310

#310

#311

#311

#312

#312

#314

#32

#323

#328

#328

#332

#332

#337

#339

#342

#343

#343

#344

#35

#359

#361

#361

#367

#367

#37

#37

#371

#373

#373

#374

#379

#379

#393

#393

#396

#406

#407

#408

#408

#409

#409

#41

#415

#415

#425

#425

#43

#433

#433

#436

#436

#44

#441

#442

#442

#443

#454

#454

#455

#455

#459

#459

#46

#460

#462

#472

#477

#480

#482

#483

#484

#484

#485

#485

#49

#493

#494

#50

#511

#517

#517

#518

#52

#527

#527

#54

#54

#545

#55

#55

#555

#558

#56

#561

#561

#566

#568

#569

#569

#57

#572

#574

#575

#575

#577

#577

#581

#585

#585

#587

#588

#588

#589

#590

#599

#60

#60

#605

#605

#607

#608

#608

#611

#614

#614

#618

#618

#619

#62

#626

#626

#640

#640

#649

#65

#653

#655

#656

#656

#66

#666

#668

#668

#670

#671

#676

#679

#684

#684

#69

#69

#692

#692

#696

#7

#7

#70

#70

#704

#706

#709

#709

#713

#718

#718

#719

#72

#723

#723

#724

#732

#733

#733

#734

#735

#736

#736

#745

#745

#747

#747

#750

#750

#757

#76

#76

#767

#768

#77

#770

#774

#774

#78

#78

#780

#781

#784

#784

#789

#790

#80

#80

#806

#81

#810

#812

#828

#834

#834

#837

#84

#842

#843

#843

#847

#849

#85

#85

#850

#851

#857

#857

#858

#858

#860

#861

#861

#862

#863

#869

#869

#881

#881

#882

#898

#9

#9

#90

#901

#91

#913

#914

#926

#943

#943

#951

#954

#954

#955

#957

#962

#963

#963

#964

#964

#966

#966

#969

#970

#972

#973

#975

#977

#98

#98

#982

#982

#984

#996

0.1.0

0.10.0

0.10.1

0.2.0

0.3.0

0.4.0

0.5.0

0.6.0

0.7.0

0.8.0

0.9.0

0.9.1

0.9.2

0.9.3

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.1.0

1.2.0

1.2.1

1.2.2

1.2.3

Mono Color

• 290378eb2f
  Merge 307c4667a9 into 0d9cd2b45c pini-gh 2023-03-26 22:25:12 +0000
• 307c4667a9 Add multiport syntax for variable VIRTUAL_PORT Gilles Filippini 2023-01-09 19:32:52 +0100
• 150b54455b
  Merge 10b80b09aa into 0d9cd2b45c Richard Hansen 2023-03-24 22:03:24 +0000
• 10b80b09aa feat: Use container names for upstream names to avoid repeats Richard Hansen 2023-01-09 17:56:41 -0500
• 4913dd7d8a fix: Don't downgrade from https to http if certificate is missing proposed-changes-for-v2 Richard Hansen 2023-02-03 02:31:08 -0500
• 27824043a5
  Merge d8965aa570 into 0d9cd2b45c 神楽坂·喵 2023-03-24 12:35:36 -0500
• 0d9cd2b45c
  Merge pull request #2186 from rhansen/fallback main Nicolas Duchon 2023-03-24 14:18:52 +0100
• d61dc73463
  Merge 524b67e6e0 into 7ca1da8358 Rafael Amorim 2023-03-21 22:51:09 +0100
• 0b896ee5b0
  Merge 56c7a3bbb7 into 7ca1da8358 Denis Arh 2023-03-21 07:49:52 +0100
• b06d753d51
  Merge branch 'main' into load-balancing Nicolas Duchon 2023-03-21 07:39:44 +0100
• 0b2b4a1128
  Merge 653563f7a1 into 1f855fc7b3 Rémi Berthoz 2023-03-20 04:24:27 +0200
• 56c7a3bbb7 Add more control over log_format config directive Denis Arh 2023-03-14 12:11:33 +0100
• 2cbb3b2a3f feat: Add support for HTTP load balancing between the proxy and upstream server groups Niek 2023-02-14 15:12:06 +0100
• 9b4bb07b34
  fix: Don't create fallback http(s) server when http(s) disabled Richard Hansen 2023-02-04 18:59:38 -0500
• 9297e94389
  fix: Emit TLS error if there are no certs available Richard Hansen 2023-02-02 22:02:06 -0500
• 16066cab61
  fix: Don't create cert error https server if https is not enabled Richard Hansen 2023-02-02 17:17:00 -0500
• 18d0671312
  chore: Factor out duplicate checks for default.crt Richard Hansen 2023-02-01 18:56:16 -0500
• 7a2b1f8833
  chore: Split $is_https variable into two separate checks Richard Hansen 2023-02-01 18:17:43 -0500
• 7ca1da8358
  feat: Add support for HTTP load balancing between the proxy and upstream server groups (#2173) Niek 2023-03-21 07:49:27 +0100
• 55d53e6659
  Merge pull request #1934 from rhansen/keepalive Nicolas Duchon 2023-03-21 07:31:13 +0100
• 6c2d17586b
  Merge pull request #2200 from nginx-proxy/docker-gen-0.10.2 1.2.3 Nicolas Duchon 2023-03-21 07:27:48 +0100
• 4696944245
  build: dockergen 0.10.1 -> 0.10.2 Nicolas Duchon 2023-03-21 07:15:34 +0100
• 49bb37dfdb feat: Add support for HTTP keep-alive between the proxy and upstream Richard Hansen 2022-03-28 02:56:36 -0400
• 1f855fc7b3
  Merge pull request #2191 from rhansen/nil-currentcontainer Nicolas Duchon 2023-03-14 06:49:21 +0100
• 364beed773 fix: Don't error if $globals.CurrentContainer is nil Richard Hansen 2023-03-10 05:05:21 -0500
• 51fd6918ca
  Merge pull request #2188 from nginx-proxy/dependabot/docker/golang-1.20.2-alpine Richard Hansen 2023-03-08 15:00:19 -0500
• 9906ccda42
  build: bump golang from 1.20.1-alpine to 1.20.2-alpine dependabot[bot] 2023-03-08 04:58:06 +0000
• d990354e3d
  Merge pull request #2187 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.2.2 Richard Hansen 2023-03-06 15:50:46 -0500
• 2fc3e6c28c
  ci: bump pytest from 7.2.1 to 7.2.2 in /test/requirements dependabot[bot] 2023-03-06 05:04:42 +0000
• abcef6be86
  Merge pull request #2184 from nginx-proxy/dockergen-0.10.1 1.2.2 Nicolas Duchon 2023-02-28 08:50:19 +0100
• 6e9d46e672
  Merge pull request #2164 from rhansen/tests Nicolas Duchon 2023-02-28 08:49:12 +0100
• 16b8cde8e4
  build: dockergen 0.10.0 -> 0.10.1 Nicolas Duchon 2023-02-28 08:36:27 +0100
• afd6544702
  Merge pull request #2179 from rhansen/swarm Nicolas Duchon 2023-02-28 07:40:16 +0100
• 4fc17d6139
  Merge pull request #2183 from JanMalte/patch-1 Richard Hansen 2023-02-21 00:56:06 -0500
• 37134c44d7 fix: Sort networks and ports before iterating Jan Malte Gerth 2023-02-20 22:46:24 +0100
• b5a54ac219 tests: Reduce scope of docker_compose fixture (and friends) Richard Hansen 2023-02-05 19:56:14 -0500
• 4d8f878ba7 tests: Fixture that simplifies Docker compose file changes Richard Hansen 2023-02-05 19:38:55 -0500
• f5a3492926 tests: Factor out DNS monkey patching to its own fixture Richard Hansen 2023-02-05 19:28:30 -0500
• 09a2f40633 tests: Turn helper function into docker_compose_file fixture Richard Hansen 2023-01-06 01:25:35 -0500
• 01745a836f tests: Fix path to ca-root.crt Richard Hansen 2023-02-05 02:44:12 -0500
• 6207be5f8f fix: Partially revert "chore: Remove support for legacy swarm" Richard Hansen 2023-02-17 01:52:05 -0500
• 6f2a549ef1
  Merge pull request #2175 from nginx-proxy/dependabot/docker/golang-1.20.1 Richard Hansen 2023-02-15 03:47:19 -0500
• de4386e440
  build: bump golang from 1.20.0 to 1.20.1 dependabot[bot] 2023-02-15 04:57:57 +0000
• bc2ada1f44
  Merge pull request #2163 from nginx-proxy/dockergen-0.10.0 1.2.1 Nicolas Duchon 2023-02-09 08:28:09 +0100
• c10c7bcbe9
  build: dockergen 0.9.4 -> 0.10.0 Nicolas Duchon 2023-02-09 08:10:43 +0100
• 41e025f0f0
  Merge pull request #2159 from rhansen/refactor Nicolas Duchon 2023-02-09 08:01:26 +0100
• ee8d2cede4
  Merge pull request #2162 from nginx-proxy/dependabot/docker/golang-1.20.0 Richard Hansen 2023-02-02 02:20:26 -0500
• 7b6b2f773d
  build: bump golang from 1.19.5 to 1.20.0 dependabot[bot] 2023-02-02 04:01:39 +0000
• 11a46f728c chore: Factor out container IP:port lookup Richard Hansen 2023-01-31 15:07:59 -0500
• 2494e20784 chore: Remove support for legacy swarm Richard Hansen 2023-01-26 19:27:21 -0500
• 1462ff019d
  Merge pull request #1179 from harvdogg/master 1.2.0 Nicolas Duchon 2023-02-01 07:42:42 +0100
• 04468eef13 chore: Remove support for legacy swarm Richard Hansen 2023-01-26 19:27:21 -0500
• 2115974e93 feat: Add ability to completely override location blocks Richard Hansen 2023-01-28 02:27:18 -0500
• 8ac8b021b8
  Merge pull request #2155 from rhansen/docker-pull Nicolas Duchon 2023-01-30 07:57:44 +0100
• 926bd43cff
  Merge pull request #2153 from rhansen/upstream-cleanup Nicolas Duchon 2023-01-30 07:56:50 +0100
• 912a065406 chore: Pass --pull to docker build to get fresh images Richard Hansen 2023-01-28 18:14:59 -0500
• 6162427c45 fix: Generate at most one server directive per container Richard Hansen 2023-01-28 00:19:21 -0500
• bcec2d9075 chore: Refactor upstream template for readability Richard Hansen 2023-01-26 19:13:36 -0500
• daeed502cb feat: Add a warning comment if the container port is published Richard Hansen 2023-01-26 18:53:50 -0500
• 5a8a6ceae2 chore: Improve debug comments in upstream template Richard Hansen 2023-01-26 16:53:52 -0500
• 2760ead490 chore: Remove warning comment when port is not exposed Richard Hansen 2023-01-26 16:39:13 -0500
• e97bf606c8 chore: Move version comment to the top of the template Richard Hansen 2023-01-25 17:49:23 -0500
• d6d53893e8
  Merge pull request #2152 from vincent-herlemont/documentation-log-format Richard Hansen 2023-01-28 03:32:21 -0500
• aa50116272 Documentation custom log format. Vincent Herlemont 2023-01-27 23:16:49 +0100
• 07cc80ac6b
  feat: Support LOG_FORMAT env variable (#2151) Vincent Herlemont 2023-01-27 18:28:40 +0100
• 37c5a27858
  fixup! Support LOG_FORMAT env variable. Richard Hansen 2023-01-27 12:25:57 -0500
• cb0d34b6e0
  fixup! Support LOG_FORMAT env variable. Richard Hansen 2023-01-27 12:24:55 -0500
• 8ce3ae180a Support LOG_FORMAT env variable. Vincent Herlemont 2023-01-26 18:44:40 +0100
• 8346b68a28 fix: Ignore VIRTUAL_HOST set to the empty string Richard Hansen 2023-01-21 19:11:28 -0500
• f8ae0a4b00 feat: DEFAULT_ROOT=none disables the default location / block Richard Hansen 2023-01-18 18:27:35 -0500
• d3ded293ac
  Merge pull request #2147 from nginx-proxy/dockergen-0.9.4 Nicolas Duchon 2023-01-24 00:27:54 +0100
• fa52426d54
  ci: set Dependabot commit prefixs Nicolas Duchon 2023-01-23 23:24:58 +0100
• 8df67cdde8
  build: dockergen 0.9.3 -> 0.9.4 Nicolas Duchon 2023-01-23 23:14:42 +0100
• 8d315ab291 feat: DEFAULT_ROOT=none disables the default location / block Richard Hansen 2023-01-18 18:27:35 -0500
• 4d664613c9 fix: Ignore VIRTUAL_HOST set to the empty string Richard Hansen 2023-01-21 19:11:28 -0500
• 98b6473c84
  Merge pull request #2141 from rhansen/debug Richard Hansen 2023-01-21 19:02:27 -0500
• 8fbc8514ef feat: Unconditionally produce debug comments Richard Hansen 2023-01-17 21:23:08 -0500
• 1775420592
  Merge pull request #2140 from rhansen/tests Nicolas Duchon 2023-01-18 08:02:02 +0100
• 92e1a6567e tests: Remove extraction of nginx.tmpl (now unnecessary) Richard Hansen 2023-01-17 00:02:02 -0500
• 486addd144 tests: Bind-mount the entire nginx-proxy directory in the container Richard Hansen 2023-01-16 23:53:51 -0500
• 569953521a tests: Exit non-zero if creation of nginx-proxy-tester image fails Richard Hansen 2023-01-16 23:49:32 -0500
• 55cfae9636 tests: Avoid unnecessary bashisms Richard Hansen 2023-01-16 23:39:20 -0500
• d56b5b370d tests: Whitespace fixes Richard Hansen 2023-01-16 23:37:48 -0500
• 26b0b05f73 tests: Fix test_debug/* tests when IPv6 is enabled Richard Hansen 2023-01-16 19:22:20 -0500
• 5d22134ee6
  Merge pull request #2137 from nginx-proxy/dockergen-0.9.3 1.1.0 Nicolas Duchon 2023-01-17 08:35:18 +0100
• b16ad27878
  build: dockergen 0.9.2 -> 0.9.3 Nicolas Duchon 2023-01-17 08:17:02 +0100
• 017a731302
  Merge pull request #2127 from rhansen/chores Nicolas Duchon 2023-01-17 07:44:57 +0100
• 2427b383b5 chore: Move global variables to a $globals dict Richard Hansen 2023-01-14 22:59:33 -0500
• 1b253cd908 chore: Wrap long comments Richard Hansen 2023-01-09 17:21:35 -0500
• 0da38122bd chore: Consistent indentation Richard Hansen 2022-05-17 01:19:32 -0400
• f20662eeaa chore: Use {{- instead of {{ to clean up whitespace Richard Hansen 2022-05-17 00:56:06 -0400
• d6d8b2205f chore: Fix comment terminators Richard Hansen 2022-05-17 00:47:40 -0400
• 4651bf411d chore: Fix comment for $proxy_connection variable Richard Hansen 2022-03-28 02:49:58 -0400
• 744bd82c54 chore: Combine identical HTTP and HTTPS servers Richard Hansen 2022-04-19 15:37:53 -0400
• 491642b1e9 chore: Factor out duplicate virtual path code Richard Hansen 2022-04-05 04:59:54 -0400
• 14d0f3f222 chore: Rename $container to $containers Richard Hansen 2022-03-28 02:13:16 -0400
• 05423c681a fix: Use parseBool to parse boolean strings Richard Hansen 2022-03-28 01:04:20 -0400
• c117ae8fd8 chore: Use boolean for $server_found variable Richard Hansen 2022-03-28 01:03:04 -0400
• 05eee4b7a3
  Merge pull request #2136 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.2.1 Richard Hansen 2023-01-16 23:28:47 -0500
• ec70f9d95a
  Merge 160068d27b into cc9edec1c6 Jonathan Underwood 2023-01-16 15:19:36 +0800