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

• ecefb0ceb5 Add Websocket configs to the template Thiago Trennepohl 2016-07-20 13:36:10 -0300
• 30128cfda0 Merge pull request #511 from kamermans/master Jason Wilder 2016-07-19 12:15:35 -0600
• fd127517b9 Added comments about httpoxy Steve Kamerman 2016-07-19 11:03:41 -0400
• 357d58ad97 Mitigate httpoxy attack (httpoxy.org, CVE-2016-(5385-5388,1000109-1000110) Steve Kamerman 2016-07-18 13:34:37 -0400
• be5703e114 Fix typo,removing equals from client_max_body_size Thiago Trennepohl 2016-07-15 10:56:52 -0300
• 92ef6baab9 Update worng directive Thiago Trennepohl 2016-07-15 10:45:24 -0300
• a125379e3a d Thiago Trennepohl 2016-07-15 10:30:33 -0300
• 656482b293 Rollback changes Thiago Trennepohl 2016-07-14 18:34:46 -0300
• 5f684d4fc5 Add docker-compose file for separate containers. ryneeverett 2016-06-27 01:26:39 -0400
• 37fed880e4 Undo some tunning configs Thiago Trennepohl 2016-07-07 15:52:56 -0300
• e1a47c1395 Add configs for tunning Thiago Trennepohl 2016-07-06 15:34:07 -0300
• 5ce4f5fd5d Increse max upload size Thiago Trennepohl 2016-07-01 18:59:54 -0300
• 3116eedc0a use JSON log format Aaron Heckmann 2016-06-21 08:21:30 -0700
• 0ea1557402
  fix forego source Lance R. Vick 2016-06-20 18:20:24 -0700
• b96d55afef Merge 8ec98e25fa into a2ab8363ca Tim Birkett 2016-06-14 17:14:06 +0000
• 8ec98e25fa Add docs for APP_KEY variable Tim Birkett 2016-06-14 18:03:34 +0100
• 3c661ed4d7 Modify template and add tests to allow an "app_key" environment variable to ping containers to different proxies. Tim Birkett 2016-06-14 17:47:06 +0100
• a2ab8363ca Merge pull request #483 from jwilder/jw-docker-gen Jason Wilder 2016-06-13 08:18:07 -0600
• 8ed5ab38b8 Update to docker-gen 0.7.3 Jason Wilder 2016-06-13 00:22:50 -0600
• db3ef67a7f Merge pull request #482 from jwilder/jw-revert Jason Wilder 2016-06-13 00:21:38 -0600
• 580517725f Revert 9c93efa Jason Wilder 2016-06-13 00:10:49 -0600
• d1e6e1c0be Merge pull request #344 from schmunk42/feature/error-code Jason Wilder 2016-06-12 15:54:40 -0600
• fc619d63ad Merge pull request #460 from kumy/patch-1 Jason Wilder 2016-06-12 15:28:40 -0600
• c36b42933d Merge pull request #462 from kamermans/master Jason Wilder 2016-06-12 15:28:08 -0600
• a0dee5c833 Remove -only-exposed from separate container instructions Jason Wilder 2016-06-12 15:25:32 -0600
• fdfb0becd2 Merge pull request #480 from jwilder/jw-certs Jason Wilder 2016-06-12 14:28:35 -0600
• fdf93cafba Add docker-compose.yml v2 example Jason Wilder 2016-06-12 13:55:18 -0600
• b325dad98d Remove -only-exposed from Procfile Jason Wilder 2016-06-12 13:54:48 -0600
• 9c93efaef9 Fix template error when /etc/nginx/certs does not exist Jason Wilder 2016-06-12 13:11:45 -0600
• adf4573de4 Remove Circle CI badge Jason Wilder 2016-06-12 10:45:59 -0600
• 25796d2c41 Merge bb1141cb8f into 8393a57f1f Giymo11 2016-06-11 13:58:59 +0000
• e043af1fa5 Merge 475d870916 into 8393a57f1f Ray Walker 2016-06-11 12:36:04 +0000
• 8393a57f1f Merge pull request #477 from jwilder/jw-nginx Jason Wilder 2016-06-10 20:22:07 -0600
• 9b0138f944 Remove docker compose v2 notes Jason Wilder 2016-06-10 20:11:58 -0600
• c256f31728 Update nginx 1.9.15 Jason Wilder 2016-06-10 20:08:10 -0600
• 3f33b7deeb Add env vars for custom template and nonstandard ports Mark Edgington 2016-06-02 20:44:13 -0400
• 6d56b1eb35 updated the readme with notes the advanced virtual host syntax Branden Cash 2016-06-01 20:55:27 -0700
• 9e47e307eb put the VIRTUAL_HOST value in quotes Branden Cash 2015-10-12 14:22:24 -0700
• cc10cc1850 Attempt to write a test for the for the virtual host syntax (couldn't get the bats working locally in OS X...1) doesn't support -r argument for xargs 2) after hanging for a long time, existing tests gave me: Branden Cash 2015-10-12 14:02:33 -0700
• 0fa127f7bb Added support for specifying destination protocol and port for each src virtual hosts. The syntax is used in the VIRTUAL_HOST env variable. Like this VIRTUAL_HOST=www.example.com=>https:8443,admin.example.com=>https:8444 Branden Cash 2015-10-12 12:58:24 -0700
• bb1141cb8f Removes the -wait flag Giymo11 2016-05-21 13:13:05 +0200
• da3e257843 Removed HSTS when HTTPS_METHOD=noredirect, added tests, improved docs wrt HSTS Steve Kamerman 2016-05-19 23:20:43 -0400
• 3d77979efb Expanded documentation on HTTPS_METHOD Steve Kamerman 2016-05-19 23:15:25 -0400
• 8c76ea9f9b Fix a typo in comment kumy 2016-05-17 01:46:46 +0200
• 473710375b Updates Readme on using Separate Containers Giymo11 2016-05-16 06:48:02 +0200
• cf604b1088 Merge 7c52b2bea7 into 0ef8dca98c Pengcheng Li 2016-05-12 10:41:03 +0000
• 7c52b2bea7 mv nginx.tmpl to templates dir Li Pengcheng 2016-05-12 18:29:49 +0800
• 52bfa6774c Readme update Ivan Isaev 2016-05-11 20:22:24 +0500
• 26b196af3e Optional passphrase support Ivan Isaev 2016-05-11 20:13:35 +0500
• 433bfc37a4 Merge 46684b7a66 into 0ef8dca98c Marc Abramowitz 2016-05-08 19:31:29 +0000
• 28be43ff82 Merge 6cdf1e6697 into 0ef8dca98c Mattias Wadman 2016-05-06 11:10:24 +0000
• 0ef8dca98c Merge pull request #443 from jwilder/jw-circle 0.4.0 Jason Wilder 2016-05-04 16:52:41 -0600
• c30640b024 Remove circle.yml Jason Wilder 2016-05-04 16:05:03 -0600
• 42a395a983 Merge a026b6d4b1 into e964b9d29f Chris Dell 2016-05-04 22:03:56 +0000
• e964b9d29f Merge pull request #441 from jwilder/jw-0.7.1 Jason Wilder 2016-05-04 16:03:52 -0600
• a026b6d4b1 Updated docker-gen to version 0.7.1 (fixes CurrentContainerID empty issue) Chris Dell 2016-05-04 22:23:06 +0100
• d40d1d4052 Update to docker-gen 0.7.1 Jason Wilder 2016-05-04 14:51:30 -0600
• 5b9264d945 Merge pull request #298 from kamermans/master Jason Wilder 2016-05-01 17:45:45 -0600
• bd30d9548a Merge 4f5c5e4655 into 1c98df2de4 Alfred UC 2016-05-01 23:36:50 +0000
• 1c98df2de4 Merge pull request #337 from baptistedonaux/master Jason Wilder 2016-05-01 17:35:48 -0600
• b5cab9261d Merge fa4cab9f6f into a72c7e6e20 darrint 2016-04-29 21:45:57 +0000
• 4f5c5e4655 add env NO_HTTPS_AUTO_REDIRECT Alfred UC 2016-04-29 10:47:51 +0900
• 9626d649d6 Merge f4aa7ec5a3 into a72c7e6e20 torz 2016-04-28 09:18:10 +0000
• f4aa7ec5a3 optional no force https redirect torz 2016-04-28 09:06:24 +0000
• ac229dcf70 Merge bfe9afaf3b into a72c7e6e20 Devin Smith 2016-04-27 17:52:38 +0000
• 3496e82235 Merge 810ff3ea88 into a72c7e6e20 nikashitsa 2016-04-22 15:56:27 +0000
• a72c7e6e20 Add docker hub badges 0.3.0 Jason Wilder 2016-04-22 09:56:21 -0600
• 810ff3ea88 Fix for docker-compose v2 syntax nikashitsa 2016-04-21 16:46:48 +0600
• 786a2375aa Using different path method to hopefully fix cert volume issue in CI systems Steve Kamerman 2016-04-20 12:47:14 -0400
• f296b273ce Normalized indentation, added explicit CERT_NAME Steve Kamerman 2016-04-20 12:33:21 -0400
• 1d0a5d9194 Added SSL/HTTPS tests Steve Kamerman 2016-04-20 12:20:08 -0400
• f294582ae8 Merge branch 'master' of https://github.com/jwilder/nginx-proxy Steve Kamerman 2016-04-20 11:05:20 -0400
• fa5b65339c Merge a8feffbd3f into 48c31836be Mike Rohland 2016-04-09 10:41:57 +0000
• a8feffbd3f moved to nginx:1.9.14 Mike Rohland 2016-04-09 12:40:30 +0200
• 6cdf1e6697 Add SKIP_HSTS support Mattias Wadman 2016-04-05 22:11:59 +0200
• 35c17666e6 Merge 809b83a73f into 48c31836be Li Chuangbo 2016-04-05 13:35:54 +0000
• 809b83a73f Add alpine image Li Chuangbo 2016-04-06 01:28:47 +1200
• f66934567e Merge remote-tracking branch 'upstream/master' Baptiste Donaux 2016-04-05 09:22:31 +0200
• 48c31836be Merge pull request #407 from jwilder/jw-travis Jason Wilder 2016-04-04 17:27:12 -0600
• 30e2da01e9 Add travis.yml Jason Wilder 2016-04-04 17:01:47 -0600
• a8a2aec9fc Merge edbfb35dbe into 59f8d4301a Thomas LÉVEIL 2016-04-04 22:56:59 +0000
• 59f8d4301a Merge pull request #406 from jwilder/jw-forego Jason Wilder 2016-04-04 16:56:49 -0600
• a54af7d73b Switch forego downloads Jason Wilder 2016-04-04 16:48:52 -0600
• edbfb35dbe README: change CI badge from CicleCI to TravisCI Thomas LEVEIL 2015-12-06 21:31:41 +0000
• f739d9179c Travis FTW Thomas LEVEIL 2015-12-06 21:19:55 +0000
• 6928d62e1e Upgrade Docker dependency from 1.9 to 1.10 Baptiste Donaux 2016-03-24 14:40:50 +0100
• 88cc096aaf [FIX] expose port for separated containers test Baptiste Donaux 2016-03-24 11:16:22 +0100
• 6b88365465 Merge remote-tracking branch 'upstream/master' Baptiste Donaux 2016-03-24 08:41:23 +0100
• 6adc04be83 Merge pull request #396 from pitkley/docker-gen-0.7.0 Jason Wilder 2016-03-23 11:33:00 -0600
• 86aea653c8 Update to docker-gen 0.7.0 Pit Kleyersburg 2016-03-22 22:47:42 +0100
• 74fb2acc4b Merge remote-tracking branch 'upstream/master' Baptiste Donaux 2016-03-23 08:52:58 +0100
• f2966c5db1 Merge pull request #374 from mrohland/master Jason Wilder 2016-03-21 16:28:18 -0600
• 1f8b480365 moved nginx to 1.9.12 Mike Rohland 2016-03-21 22:47:01 +0100
• 9671e0c1a2 Merge branch 'master' of https://github.com/jwilder/nginx-proxy Steve Kamerman 2016-03-18 13:47:11 -0400
• 1bd9a5b61b Merge pull request #2 from pebble/cloudfront-support Chase 2016-03-18 17:06:36 +0100
• c6459aabab Renaming one of the params to fly around an nginx bug Chase Sillevis 2016-03-18 17:03:25 +0100
• b3c87cc981 Merge pull request #1 from pebble/cloudfront-support Chase 2016-03-18 15:22:05 +0100
• b86c797109 Try to understand CloudFront's forwarded-proto as well Chase Sillevis 2016-03-18 14:34:39 +0100
• 3453335910 Update README.md David Parrish 2016-03-08 14:31:19 -0500
• a8353e9547 Merge f6aa0f55d3 into 87d0c68aac Ted Wang 2016-03-04 07:28:38 +0000