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

• ad9af2884d Merged master, fixed BATS conflict Steve Kamerman 2017-03-06 10:48:12 -0500
• 58f71d7907 prepend the generated nginx config file with a warning when $CurrentContainer is null Thomas LEVEIL 2017-02-27 00:56:40 +0100
• 6554a1cf28 Merge pull request #732 from matt-hh/feature/upgrade-1.11.10 Jason Wilder 2017-02-21 10:18:23 -0700
• 7bafa37a52 Upgrade to nginx 1.11.10 Matthias Döring 2017-02-19 21:32:22 +0100
• 9e31d5042f Merge pull request #735 from thomasleveil/test_events Jason Wilder 2017-02-20 22:57:19 -0700
• 2aef648f3d TESTS: add a test to verify nginx conf is update on container creation/deletion Thomas LEVEIL 2017-02-21 03:20:38 +0100
• a3e285d7a8 Patched template file to work with api-gateway Vladimir Garvardt 2017-02-20 15:30:35 +0100
• b3df03cb4f always add server to upstream (hot)fix #438 #565 Tobias Munk 2016-09-27 13:56:46 +0200
• 19d0d33322 display error message and dump nginx config file in case nginx failed to reload Thomas LEVEIL 2017-02-16 01:15:24 +0100
• 68816390ee Merge pull request #655 from thomasleveil/pytest Jason Wilder 2017-02-18 09:52:38 -0700
• dd443f3eca TESTS: ignore the requirements and certs directory when collecting tests Thomas LEVEIL 2017-02-17 01:24:48 +0100
• 9620be91fa TESTS: separated containers: fix indentation and remove dependency over jwilder/whoami image Thomas LEVEIL 2017-02-17 01:09:53 +0100
• 85370fa31f TESTS: improve error reporting for failed to run docker-compose commands Thomas LEVEIL 2017-02-14 22:30:20 +0100
• 6069bc53cd TESTS: replace old test suite with the new one Thomas LEVEIL 2017-02-17 00:10:21 +0100
• 250a01d235 TESTS: add tests for IPv6 support Thomas LEVEIL 2017-02-16 23:27:28 +0100
• 78375632dd TESTS: adjust Travis-CI config (upgrade to docker 1.13 and no more docker-compose) Thomas LEVEIL 2017-02-14 03:19:00 +0100
• a6e4f7f3ad TESTS: adjust Travis-CI config Thomas LEVEIL 2017-02-14 03:01:50 +0100
• 02f9e29a31 TESTS: make pytest verbose by default Thomas LEVEIL 2017-02-14 03:01:35 +0100
• 9f26efdf86 TESTS: add tests for IPv6 Thomas LEVEIL 2017-02-14 01:39:08 +0100
• e6b9d2f5e7 TESTS: show skip reason in test summary Thomas LEVEIL 2017-02-14 02:19:13 +0100
• eeb27f7b50 TESTS: fix failure raising when cannot get nginx-proxy nginx configuration file Thomas LEVEIL 2017-02-14 02:12:22 +0100
• 43d8ba0e78 TESTS: add tests for using nginx and docker-gen in separated containers Thomas LEVEIL 2017-02-11 22:42:24 +0100
• a533ff6aff TESTS: add support for resolving containers IP address from domain names in the form *.<container name>.container.docker Thomas LEVEIL 2017-02-11 22:41:09 +0100
• 743d9801e9 TESTS: make test now runs tests from a docker container Thomas LEVEIL 2017-02-11 03:58:23 +0100
• e6bc7e6043 TESTS: rename nginx-proxy-tester.sh to test.sh Thomas LEVEIL 2017-02-11 03:47:31 +0100
• 87926db4c3 TESTS: upgrade to docker python module 2.0.2 and docker-compose 1.11.1 Thomas LEVEIL 2017-02-11 03:43:01 +0100
• fdde850fc2 TESTS: pytest checks the existance of the jwilder/nginx-proxy:test image Thomas LEVEIL 2017-02-11 02:23:07 +0100
• 3e92192dc4 TESTS: add test for multiple networks Thomas LEVEIL 2017-02-11 02:04:40 +0100
• 3ecae2f020 TESTS: the docker_compose pytest fixture is now responsible for attaching the container running pytest to all docker networks Thomas LEVEIL 2017-02-11 01:56:23 +0100
• dcf8dd4682 TESTS: refactor conftest.py Thomas LEVEIL 2017-02-11 00:51:17 +0100
• 3f88ba8903 TESTS: refactor conftest.py Thomas LEVEIL 2017-02-11 00:12:55 +0100
• 10cd3e5f81 TESTS: refactor conftest.py Thomas LEVEIL 2017-02-11 00:02:42 +0100
• ad57c48465 Fixed HTTPS test Steve Kamerman 2017-01-31 23:57:16 -0800
• 912f5615dc Reorganized certs Steve Kamerman 2017-02-01 07:41:12 +0000
• 8995ba02ba Fixed assertion bug Steve Kamerman 2017-02-01 07:40:58 +0000
• d0e5870060 Added certs, fixed typos Steve Kamerman 2017-02-01 07:09:51 +0000
• 65371e513a Renamed wildcard cert and key Steve Kamerman 2017-01-31 22:50:51 -0800
• 087592df2c TESTS: simplify nginx-proxy-tester.sh Thomas LEVEIL 2017-01-28 15:10:10 +0100
• 9d8f0db268 TESTS: remove containers after each test Thomas LEVEIL 2017-01-28 11:25:54 +0100
• 541ce48292 fixup! TESTS: add support for compose syntax v2 Thomas LEVEIL 2017-01-28 11:19:19 +0100
• 889dfea4ca TESTS: adjust logging (when using pytest -s) Thomas LEVEIL 2017-01-27 03:31:33 +0100
• 150365e784 fixup! TESTS: add test for custom default configuration Thomas LEVEIL 2017-01-27 03:30:50 +0100
• 23d361d1da TESTS: reorganize tests into subfolders Thomas LEVEIL 2017-01-27 02:52:17 +0100
• eeed150858 README: fix instruction for overriding default custom conf Thomas LEVEIL 2017-01-27 02:34:46 +0100
• 8aa3158952 TESTS: add test for custom default location configuration Thomas LEVEIL 2017-01-27 02:34:11 +0100
• 713149df8e TESTS: add test for custom default configuration Thomas LEVEIL 2017-01-27 02:24:46 +0100
• ee5b0f96ad TESTS: add test for custom per vhost configuration in location block Thomas LEVEIL 2017-01-27 02:08:35 +0100
• a283c95e2e TESTS: nginxproxy fixture can provide the nginx generated conf in tests Thomas LEVEIL 2017-01-27 02:07:56 +0100
• f512a56faf TESTS: add test for custom per vhost configuration Thomas LEVEIL 2017-01-27 02:01:57 +0100
• 2425574958 TESTS: add test for custom proxy-wide configuration Thomas LEVEIL 2017-01-27 01:55:46 +0100
• 73fda600b3 TESTS: add verbosity Thomas LEVEIL 2017-01-27 03:48:06 +0100
• 0d00bd2322 TESTS: fix passing pytests args to nginx-proxy-tester script Thomas LEVEIL 2017-01-27 03:45:47 +0100
• 399e19e2dc TESTS: add support for compose syntax v2 Thomas LEVEIL 2017-01-26 01:30:17 +0100
• 787fa28799 TESTS: add script to run the test suite from a docker container Thomas LEVEIL 2017-01-24 22:42:13 +0100
• 7a4cae050c TESTS: abort test suite if the 'jwilder/nginx-proxy:test' image is missing Thomas LEVEIL 2017-01-25 01:11:36 +0100
• 86be8a9424 TESTS: fix retry delay Thomas LEVEIL 2017-01-24 22:47:37 +0100
• 0f1bb344ff TESTS: port tests for #590 to docker-compose test Thomas LEVEIL 2017-01-14 12:30:48 +0100
• 197d793a25 TESTS: rewrite tests using pytest and docker-compose Thomas LEVEIL 2016-12-10 00:53:23 +0100
• 985c46d8b5 Merge pull request #679 from thomasleveil/issue-677 Jason Wilder 2017-02-16 12:11:06 -0700
• 2d588871f0 Merge pull request #719 from thomasleveil/optional_IPv6 Jason Wilder 2017-02-16 12:09:30 -0700
• 5ea383bf34 Merge 8e2dc9cddb into c5c6a6149d Jason Wilder 2017-02-16 17:36:09 +0000
• c5c6a6149d Merge pull request #724 from rindek/master Jason Wilder 2017-02-16 09:42:22 -0700
• d7a2aa7823 Merge pull request #676 from matt-hh/feature/alpine-readme Jason Wilder 2017-02-16 09:40:12 -0700
• 0e94e1e4bd First load docker-gen, then nginx Jacek Jakubik 2017-02-16 10:47:38 +0100
• f0951df040 optional IPv6 support Thomas LEVEIL 2017-02-14 22:48:29 +0100
• 8e2dc9cddb Revert "Add IPv6 listen address" Jason Wilder 2017-02-14 11:46:39 -0700
• d0f4edea4a Merge c021d82f91 into c0f60087c3 Tobias Munk 2017-02-13 19:12:50 +0000
• c0f60087c3 Merge pull request #713 from schrieveslaach/master Jason Wilder 2017-02-13 09:25:33 -0700
• 8b67b2182f Add IPv6 listen address Marc Schreiber 2017-02-11 13:28:34 +0100
• b680816505 Compose v3: Moved shared volume to top-level volumes entry Sami Jawhar 2017-02-08 16:39:54 -0800
• 394ae5ef29 Merge 5039bbd96f into b9e2053c38 Jan 2017-02-07 03:17:04 +0000
• b9e2053c38 Merge pull request #704 from yosmanyga/patch-1 Jason Wilder 2017-02-06 12:43:16 -0700
• cdb38d06ba Merge pull request #706 from matt-hh/feature/upgrade-1.11.9 Jason Wilder 2017-02-06 12:38:41 -0700
• 15cbb5debf Upgrade to nginx 1.11.9 Matthias Döring 2017-02-05 21:40:29 +0100
• d8f66e2411 Fixed typo Yosmany Garcia 2017-02-03 16:19:40 -0800
• c0a0300f12 Merge pull request #696 from kevindoveton/master Jason Wilder 2017-01-26 23:20:40 -0700
• 4c06935b62 Update README.md Kevin Doveton 2017-01-27 13:24:24 +1030
• 2be48ec982 Update EXPOSE link in README.md Kevin Doveton 2017-01-27 13:16:27 +1030
• d320b43476 Merged conflict in BATS SSL test Steve Kamerman 2017-01-26 13:46:11 -0500
• 5c60778ab2 Removed VOLUME [/etc/nginx/certs]. Milos Svasek 2017-01-26 15:09:06 +0100
• 5039bbd96f Added support for VIRTUAL_PATH and restructured template Jan Kunzmann 2017-01-20 20:27:55 +0100
• 1aec911b09 Fix PR comments Santiago Castro 2017-01-16 15:03:37 -0300
• 3f6381d0fa regexp: use sha1 for upstream only if regexp is used Thomas LEVEIL 2017-01-14 11:40:33 +0100
• 2c5d4ee3a9 Merge pull request #590 from kamermans/feature_nohttps Jason Wilder 2017-01-13 16:16:16 -0700
• 276b4dbe3e Merge branch 'master' into feature_nohttps Steve Kamerman 2017-01-13 13:07:03 -0500
• 83a28f47d7 Fixed long server name comment, improved dhparam check Steve Kamerman 2017-01-12 17:43:13 -0500
• b0de1f19d3 Updated to use 256-bit dhparam in tests Steve Kamerman 2017-01-12 17:25:31 -0500
• 7d253dd0f3 Allow passing DHPARAM_BITS via env, lower bits to 256 for unit tests Steve Kamerman 2017-01-12 14:55:25 -0500
• dffc0c47cf Tweak test for reliability on Travis-CI Steve Kamerman 2017-01-12 10:52:56 -0500
• c219822cd8 Typos Steve Kamerman 2017-01-12 01:53:36 -0500
• f73a52afaf Added BATS tests for dhparam generation Steve Kamerman 2017-01-12 01:45:46 -0500
• 7c0f7b9449 Fixed Alpine image, removed dhparams gen from test units Steve Kamerman 2017-01-12 00:21:39 -0500
• 6242403d33 Added dhparam support for alpine variant Steve Kamerman 2017-01-11 23:04:24 -0500
• ebfe5e9c17 Added note about background generation Steve Kamerman 2017-01-11 22:49:55 -0500
• dfdd67f5a4 Implemented background dhparam generation Steve Kamerman 2017-01-11 22:39:04 -0500
• f186815c2d Merged upstream Steve Kamerman 2017-01-11 22:42:35 -0500
• 8dfe5ae384 Add info about alpine base image Matthias Döring 2017-01-11 16:57:37 +0100
• 3d20c626c8 Merge pull request #359 from sw-double/master Jason Wilder 2017-01-10 09:21:19 -0700
• f1ccde2fe3 Merge pull request #671 from thomasleveil/regex-end-of-line Jason Wilder 2017-01-10 09:20:28 -0700
• 16c9853dc2 Set appropriate X-Forwarded-Ssl header. Konstantin L 2016-02-11 23:54:32 +0300