Commit graph

Select branches

Hide pull requests

2424

Mio

docker-entrypoint

feat/308

feat/dockergen-container

goreman

main

proposed-changes-for-v2

test/nginx-conf

test/performance

#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

#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

#1220

#1225

#123

#1230

#1234

#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

#1407

#1409

#1417

#142

#1429

#1430

#1430

#1432

#1437

#1438

#1444

#1446

#1447

#145

#145

#1452

#1470

#1477

#1477

#1487

#1487

#1488

#1496

#1499

#1499

#15

#15

#1500

#1505

#1508

#1510

#1511

#1518

#1519

#152

#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

#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

#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

#1991

#1992

#1995

#1996

#1997

#2

#20

#20

#2002

#2004

#2008

#2011

#2012

#2014

#2016

#202

#2024

#2025

#2028

#2031

#2036

#2040

#2042

#2045

#2046

#2057

#2058

#206

#206

#2069

#2069

#2072

#2077

#2078

#2079

#2080

#2081

#209

#209

#2091

#2091

#21

#21

#2102

#2110

#2115

#2118

#2121

#2127

#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

#22

#22

#220

#2200

#2206

#2207

#2213

#2214

#2216

#2219

#2220

#2222

#2225

#2226

#2227

#2228

#2229

#223

#2230

#2231

#2232

#2234

#2236

#2237

#2238

#2239

#224

#2244

#2245

#2247

#225

#2250

#2251

#2252

#2255

#2259

#2261

#2263

#2266

#2267

#227

#227

#2273

#2274

#2275

#2278

#2279

#2279

#228

#2281

#2281

#2283

#2285

#2292

#2296

#2297

#23

#23

#230

#2300

#2303

#2304

#2305

#2306

#2307

#232

#232

#2321

#2322

#2324

#2336

#2338

#2340

#2341

#2343

#2346

#2347

#2348

#2349

#235

#2350

#2354

#2355

#2356

#2357

#2358

#2359

#2360

#2361

#2362

#2364

#2365

#2369

#2372

#2377

#2377

#2380

#2381

#2383

#2385

#2387

#2388

#2389

#2390

#2393

#2395

#2396

#2397

#2398

#2399

#240

#2400

#2401

#2402

#2404

#2405

#2406

#2407

#2408

#2410

#2411

#2413

#2420

#2422

#2425

#2428

#2429

#243

#243

#2430

#2432

#2433

#2434

#2435

#2436

#2437

#2438

#2439

#244

#244

#2440

#2444

#2445

#2446

#2447

#2448

#2449

#245

#245

#2450

#2451

#2452

#2453

#2453

#2455

#2459

#246

#2460

#2461

#2462

#2465

#2467

#2468

#2470

#2471

#2472

#2473

#2475

#2477

#2478

#248

#2485

#2488

#2488

#2493

#2494

#2495

#2497

#2498

#2499

#2504

#2505

#2506

#2510

#2512

#2514

#2514

#2519

#252

#2520

#2525

#2533

#2534

#2535

#2536

#2537

#2538

#254

#2545

#2546

#2547

#2548

#2549

#255

#255

#2550

#2551

#2554

#2558

#256

#2561

#2563

#2565

#2566

#2567

#2567

#2569

#257

#2570

#2576

#2584

#2584

#259

#26

#260

#262

#264

#265

#271

#271

#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

#607

#608

#608

#611

#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

1.3.0

1.3.1

1.4.0

1.5.0

1.5.1

1.5.2

1.6.0

1.6.1

1.6.2

1.6.3

1.6.4

1.7.0

Mono Color

• e3be0de5ba Merge branch 'source' into upstream neil 2017-06-13 10:00:53 +0800
• a57a920289 Merge 6c8009c049 into 90b62e0abc Rich Tibbett 2017-06-13 01:59:10 +0000
• 5af1bac769 add ssl for alpine neil 2017-06-13 09:58:11 +0800
• 165edc2f1d Merge pull request #3 from jwilder/master neil 2017-06-13 09:25:26 +0800
• 90b62e0abc Merge pull request #851 from Neilpang/worker_processes Jason Wilder 2017-06-12 19:23:29 -0600
• af1abee2b2 Merge pull request #2 from jwilder/master neil 2017-06-13 09:14:56 +0800
• a3cd96ead4 alpine fix worker_processes to "auto" neil 2017-06-13 09:11:27 +0800
• e3b6be79fc Merge pull request #847 from jwilder/appropriate-trim-earlier Jason Wilder 2017-06-12 09:48:27 -0600
• 1867228cce fix worker_processes to "auto" neil 2017-06-12 15:59:55 +0800
• a8ee64b059 running proxy on host network neilpang 2017-06-10 15:07:45 +0800
• 4e4733f68e Trim $host and $proto before they are used Jason Wilder 2017-06-09 12:55:39 -0600
• be8bb6e78a AD ACME_BUILD_DATE neil 2017-06-09 09:54:51 +0800
• b145ff0de9 Merge branch 'master' of https://github.com/Neilpang/nginx-proxy neilpang 2017-06-08 22:39:47 +0800
• ddd5e97b8f reload first neilpang 2017-06-08 22:39:29 +0800
• c9e8e8259d flush cache neil 2017-06-06 14:13:15 +0800
• 01f3b3236d fix cronjob neil 2017-06-06 10:10:52 +0800
• f20864f42e move cron to shell neil 2017-06-06 09:20:50 +0800
• 19cce31a09 add ENABLE_HSTS, "false" by default to disable HSTS. neilpang 2017-06-05 23:19:30 +0800
• 45e89592d3 location is needed for acme.sh nginx mode neilpang 2017-06-05 22:42:06 +0800
• 6285a64264 Merge 4e884e2258 into 23a2c7d848 neil 2017-06-04 13:37:59 +0000
• 4e884e2258 fix typo neilpang 2017-06-04 21:37:41 +0800
• cd1e368128 update doc for letsencrypt neilpang 2017-06-03 21:32:15 +0800
• f8542b6515 EXPOSE 443 neilpang 2017-06-03 20:48:18 +0800
• a333e242ff move server name back neilpang 2017-06-03 20:31:56 +0800
• f4c77d13dd fix reload neilpang 2017-06-03 19:54:42 +0800
• ac19d7387d Revert "move listen 80 to the first line." neilpang 2017-06-03 19:32:29 +0800
• 0bf5903602 fix reload neilpang 2017-06-03 18:54:10 +0800
• c2c069bd8f fix reload cmd neilpang 2017-06-03 18:51:02 +0800
• d511153ee4 fix cron neilpang 2017-06-03 18:38:17 +0800
• 7facc23dc0 move listen 80 to the first line. neilpang 2017-06-03 18:07:57 +0800
• ceec29af20 minor neilpang 2017-06-03 17:26:53 +0800
• ecb0e29a2c fix acme neilpang 2017-06-03 17:21:23 +0800
• efc1f9100a Merge branch 'master' of https://github.com/Neilpang/nginx-proxy neilpang 2017-06-03 16:52:26 +0800
• 9ee4d49cb7 fix typos neilpang 2017-06-03 16:52:12 +0800
• 508bbf7d02 exmode root 2017-06-03 16:33:31 +0800
• 76233f2032 add acme.sh to support auto ssl neilpang 2017-06-03 16:31:21 +0800
• 2f401447c7 generate single server section for one container with multiple vhost domains. neilpang 2017-06-03 15:30:33 +0800
• ab4b993644
  Break into build stages - Saves 10MB in space Dan Schaper 2017-05-27 17:35:53 -0700
• 1b366e5e9c Remove weak Cipher DES-CBC3-SHA Support Thomas Eimers 2017-05-26 11:51:17 +0200
• ab46038b11 Fixed nginx config generation Brain-Gamer 2017-05-20 20:00:30 +0200
• ae1b1f3e22 Uncommenting important line Brain-Gamer 2017-05-20 19:08:48 +0200
• 86d4ad3806 Adding support for armhf Brain-Gamer 2017-05-20 18:58:17 +0200
• 7c2ad4c4ae Merge 36be582e69 into 23a2c7d848 Mattias Wadman 2017-05-08 17:50:29 +0000
• 81a6a3e812 Merge 598292e9f3 into 23a2c7d848 Ryan Schmukler 2017-05-08 17:50:29 +0000
• 14d4cba967 Merge ea21e67918 into 23a2c7d848 Dylan Fox 2017-05-08 17:50:17 +0000
• b1e45594b2 Merge 00818827de into 23a2c7d848 tdemalliard 2017-05-08 17:50:17 +0000
• 5396c8af7f Merge 198277334b into 23a2c7d848 Jacek Jakubik 2017-05-08 17:49:32 +0000
• 36ef82e9fc Merge 1e1565064f into 23a2c7d848 Daniel Einspanjer 2017-05-08 17:49:32 +0000
• 4ee9533f08 Merge 57e23019c3 into 23a2c7d848 Denny Huang 2017-05-08 17:49:32 +0000
• 1b0ce87abc Merge 323d66f284 into 23a2c7d848 Melwin Kieffer 2017-05-08 17:49:31 +0000
• 9ef03eb058 Merge 57bdb2035e into 23a2c7d848 Manu 2017-05-08 17:49:31 +0000
• 4b89d3b529 Merge ed38dd735c into 23a2c7d848 Brikou CARRE 2017-05-06 23:01:20 +0000
• 007caaaab7 Merge 0b305da204 into 23a2c7d848 David Cornejo 2017-05-06 22:58:01 +0000
• c83db28509 Merge 5c60778ab2 into 23a2c7d848 Milos Svasek 2017-05-06 12:55:24 +0000
• 6154521561 Merge a3e285d7a8 into 23a2c7d848 Vladimir Garvardt 2017-05-06 12:55:24 +0000
• 6397a7a7d6 Merge 58f71d7907 into 23a2c7d848 Thomas LÉVEIL 2017-05-06 12:55:24 +0000
• e78240907c Merge 19d0d33322 into 23a2c7d848 Thomas LÉVEIL 2017-05-05 09:14:25 +0000
• 00ffcb6100 Merge 5dc80ae64f into 23a2c7d848 Rubin Gjerovski 2017-05-04 21:42:52 +0000
• cad61de991 Merge 5d99c388f6 into 23a2c7d848 Thomas LÉVEIL 2017-05-04 21:42:50 +0000
• 23a2c7d848 Merge pull request #812 from thueske/master Jason Wilder 2017-05-04 15:39:57 -0600
• 2c4102d396 Upgrade to 1.13.0 Tobias Hüske 2017-05-04 18:57:00 +0200
• fed6df3756 Merge pull request #768 from thomasleveil/wildcard_cert_nohttps Jason Wilder 2017-05-03 17:02:40 -0600
• 965c722344 Merge pull request #810 from rtalvarez/readme-typo Jason Wilder 2017-05-03 16:57:40 -0600
• f2487741dc Fix README typo Roberto Alvarez 2017-05-03 11:06:34 -0500
• 860c7b533b Prevent error no servers are inside upstream SilverFire - Dmitry Naumenko 2017-05-03 12:05:14 +0200
• 2af674b880 Remove container_name Oliver Davies 2017-04-28 23:02:49 +0100
• 1b14e15a20 Remove container_name Oliver Davies 2017-04-28 22:59:00 +0100
• 8ca9cb0a92 Merge branch 'master' into patch-1 Sami Jawhar 2017-04-14 21:30:53 -0700
• d85c033f61 Set compose file version back to 2.1 for separate containers Sami Jawhar 2017-04-12 05:39:35 -0700
• b6a445b1a9 Merge pull request #790 from versada/fix-typo Jason Wilder 2017-04-11 10:48:12 -0600
• cf88817355
  DOC: fixed typo Naglis Jonaitis 2017-04-11 11:43:47 +0300
• 851b0e36cd Merge pull request #789 from matt-hh/feature/upgrade-1.11.13 Jason Wilder 2017-04-07 09:38:33 -0600
• 172d79aff4 Upgrade to nginx 1.11.13 Matthias Döring 2017-04-07 12:58:49 +0200
• ca6b323654 Added DEFAULT_IP env variable mitja 2017-04-06 10:55:38 +0200
• c24a39711b added VIRTUAL_PATH support Stefan Fussenegger 2017-03-31 12:14:49 +0200
• 6a2f8c7fcd forward published port set by PORT_HTTP and PORT_HTTPS Stefan Fussenegger 2017-03-30 10:02:04 +0200
• 6c8009c049 Do not bind upstream with 'ingress' network that is given to all nodes in swarm mode Rich Tibbett 2017-03-24 17:45:18 +0100
• 619943ac1e Merge pull request #770 from sischnei/http2-in-readme 0.6.0 Jason Wilder 2017-03-18 09:38:16 -0600
• 6fd32b5a9b Updated README to include HTTP/2.0 sischnei 2017-03-18 10:52:43 +0100
• 8414a94d59 TESTS: add test for the case in which a wildcard cert matches a container having nohttps set Thomas LEVEIL 2017-03-15 02:11:21 +0100
• 82133865d4 Merge pull request #767 from thomasleveil/patch-1 Jason Wilder 2017-03-14 18:57:53 -0600
• 77e022cf28 DOC: reflect change from PR #344 Thomas LÉVEIL 2017-03-15 01:32:47 +0100
• 5c2f50402a fix template when running docker-gen and nginx in separate containers Thomas LEVEIL 2017-02-27 00:57:44 +0100
• 41006c36a5 TESTS: adjust logging levels Thomas LEVEIL 2017-02-25 02:16:38 +0100
• d282c2481b TESTS: the web image can now handle concurrent connections Thomas LEVEIL 2017-02-25 02:15:37 +0100
• 563cfedb98 TESTS: add test for the docker entrypoint script Thomas LEVEIL 2017-02-24 00:35:33 +0100
• 0f7cddee4d get rid of forego Thomas LEVEIL 2017-02-21 03:32:12 +0100
• 5d99c388f6 Add useful debugging comments into the generated nginx config file Thomas LEVEIL 2017-02-26 15:27:21 +0100
• de2f057c10 TESTS: add test for unreachable container Thomas LEVEIL 2017-02-21 01:55:52 +0100
• 6dfc3f3f70 TESTS: add stress test when a certificate file is missing Thomas LEVEIL 2017-02-21 01:05:42 +0100
• e25c78b00a TESTS: add pytest incremental marker to mark tests as expected to fail if previous test failed Thomas LEVEIL 2017-02-21 01:04:50 +0100
• a3fbaa5990 TESTS: add directory for tests featuring scenarios trying to make nginx-proxy fail Thomas LEVEIL 2017-02-21 01:01:00 +0100
• 6912414750 Merge branch 'master' into feature_ssl_improvement Steve Kamerman 2017-03-08 11:31:01 -0500
• e373a5199b Merge branch 'master' into feature_ssl_improvement Steve Kamerman 2017-03-08 10:49:02 -0500
• d5deff21c5 Merge pull request #757 from thomasleveil/issue/755 Jason Wilder 2017-03-07 23:34:45 -0700
• c2544d4c78 Merge pull request #2 from thomasleveil/PR/589 Steve Kamerman 2017-03-07 20:51:06 -0500
• abdd5883a1 TESTS: refactor dhparam tests Thomas LEVEIL 2017-03-08 02:37:12 +0100
• 98b5828f83 Modified tests to include dhparams Steve Kamerman 2017-03-07 14:04:44 -0500
• 0244b4e71e Added dhparams test in new format Steve Kamerman 2017-03-07 14:04:37 -0500
• 99a569b2e6 fix #755: Tests fail with new Docker version scheme Thomas LEVEIL 2017-03-06 23:36:16 +0100