thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2026-08-15 18:42:48 +00:00
Code Issues Releases Wiki Activity
882 Commits 3 Branches 6 Tags
75c7b1399bfe57707550adcafe1dae1f567aa80d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Duchon 75c7b1399b build: golang 1.18.1 -> 1.18.8 2022-12-02 00:21:56 +01:00
Nicolas DuchonandGitHub 284a935f3c Merge pull request #2102 from nginx-proxy/dockergen-0.9.1 
build: dockergen 0.9.0 -> 0.9.1
 2022-12-01 23:44:14 +01:00
Nicolas DuchonandGitHub 050d9da7bd docs: nginx badge 1.21.6 -> 1.23.2 2022-12-01 23:24:53 +01:00
Nicolas Duchon b4dd1a4ba8 build: dockergen 0.9.0 -> 0.9.1 2022-12-01 23:22:02 +01:00
Nicolas DuchonandGitHub 22d58656a0 Merge pull request #2042 from valerebron/patch-1 
Simple mistake in DEFAULT_ROOT variable name
 2022-12-01 22:54:18 +01:00
Nicolas DuchonandGitHub 7a1fe49841 Merge pull request #2081 from nginx-proxy/dependabot/pip/test/requirements/docker-6.0.1 
chore(deps): bump docker from 5.0.3 to 6.0.1 in /test/requirements
 2022-12-01 22:11:37 +01:00
Nicolas DuchonandGitHub 4f11827752 Merge pull request #2058 from nginx-proxy/dependabot/pip/test/requirements/backoff-2.2.1 
chore(deps): bump backoff from 1.11.1 to 2.2.1 in /test/requirements
 2022-12-01 15:29:28 +01:00
Nicolas DuchonandGitHub 91fac60aae Merge pull request #2008 from nginx-proxy/dependabot/pip/test/requirements/requests-2.28.1 
chore(deps): bump requests from 2.27.1 to 2.28.1 in /test/requirements
 2022-12-01 14:01:00 +01:00
Nicolas DuchonandGitHub 515c736d5a Merge pull request #2077 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.2.0 
chore(deps): bump pytest from 7.1.2 to 7.2.0 in /test/requirements
 2022-12-01 13:00:08 +01:00
Nicolas DuchonandGitHub 14ccabf45a Merge pull request #2072 from nginx-proxy/dependabot/docker/nginx-1.23.2 
chore(deps): bump nginx from 1.21.6 to 1.23.2
 2022-12-01 12:50:00 +01:00
Nicolas DuchonandGitHub c4ad18fecc Merge pull request #1971 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.1.2 
chore(deps): bump pytest from 7.1.1 to 7.1.2 in /test/requirements
 2022-04-26 07:55:46 +02:00
Nicolas DuchonandGitHub 70d33d976b Merge pull request #1939 from ntnj/main 
chore: indent location, upstream in template
 2022-04-18 16:16:00 +02:00
Nicolas DuchonandGitHub 705b29c14f Merge pull request #1960 from nginx-proxy/dependabot/docker/golang-1.18.1 
chore(deps): bump golang from 1.18.0 to 1.18.1
 2022-04-18 15:52:55 +02:00
Nicolas DuchonandGitHub 2f82265891 Merge pull request #1940 from nginx-proxy/dockergen-0.9.0 
Bump docker-gen from 0.8.4 to 0.9.0
 2022-04-10 13:35:44 +02:00
Nicolas Duchon 2e1da37f9a build: bump docker-gen from 0.8.4 to 0.9.0 2022-04-10 13:15:02 +02:00
Nicolas DuchonandGitHub 576ccc7009 Merge pull request #1933 from nginx-proxy/dockergen-0.8.4 
Bump docker-gen from 0.8.2 to 0.8.4
 2022-04-10 12:58:42 +02:00
Nicolas Duchon 6a0a1f6782 build: bump docker-gen from 0.8.2 to 0.8.4 2022-03-25 11:05:17 +01:00
Nicolas DuchonandGitHub 0442ed9b72 Merge pull request #1929 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.1.1 
chore(deps): bump pytest from 7.0.1 to 7.1.1 in /test/requirements
 2022-03-23 16:38:10 +01:00
Nicolas DuchonandGitHub d851908c67 Merge pull request #1931 from rhansen/http-port 
Fix IPv6 HTTP listen port
 2022-03-23 16:37:47 +01:00
Nicolas Duchon 4ea3437dfa chore: include license into the Docker images 2022-03-09 12:05:56 +01:00
Nicolas DuchonandGitHub 6b48e11e5c Merge pull request #1444 from pini-gh/app-folder 
Do not copy useless files into the image
 2022-03-07 16:22:39 +01:00
Nicolas Duchon fea6cc7537 chore: update .dockerignore 2022-03-07 16:01:15 +01:00
Nicolas Duchon 3257177d80 fix: remove outdated comment from Dockerfiles 2022-03-07 14:14:16 +01:00
Nicolas Duchon 5ee6db5e3e ci: remove dev branch build, fix build on tags 2022-03-07 14:12:26 +01:00
Nicolas DuchonandGitHub 46eed825f1 Merge pull request #1917 from nginx-proxy/dependabot/docker/golang-1.17.8 
chore(deps): bump golang from 1.17.7 to 1.17.8
 2022-03-07 10:06:46 +01:00
Nicolas DuchonandGitHub 993e5f8282 ci: publish the alpine image to ghcr.io too 2022-03-04 11:10:14 +01:00
Nicolas DuchonandGitHub 5ab320d82a ci: publish Docker images to ghcr.io 2022-03-04 10:59:50 +01:00
Nicolas DuchonandGitHub fb8ddfd08c Merge pull request #1884 from nginx-proxy/dependabot/docker/golang-1.17.7 
chore(deps): bump golang from 1.16.7 to 1.17.7
 2022-02-24 16:48:24 +01:00
Nicolas DuchonandGitHub fee27ea712 docs: nginx badge 1.21.5 -> 1.21.6 2022-02-24 16:43:45 +01:00
Nicolas DuchonandGitHub e85ff32f35 Merge pull request #1902 from nginx-proxy/dockergen-0.8.2 
Bump docker-gen to 0.8.2
 2022-02-24 16:39:15 +01:00
Nicolas Duchon 621e703fad build: docker-gen main -> 0.8.2 2022-02-24 16:21:10 +01:00
Nicolas DuchonandGitHub 55651bba8b Merge pull request #1901 from nginx-proxy/dev 
Path based routing (VIRTUAL_PATH)
 2022-02-24 16:15:50 +01:00
Nicolas Duchon 0185a2971c tests: fix virtual path tests for new dhparam 2022-02-24 15:21:14 +01:00
Nicolas Duchon b6b7133a2e fix: minor fixes on nginx template 2022-02-24 15:17:47 +01:00
Nicolas Duchon 01446472dd Revert "ci: use docker-gen main on dev branch tests" 
This reverts commit b6e9cdc065.
 2022-02-24 15:08:45 +01:00
Nicolas DuchonandJonathan Underwood 12887a977b docs: update DEFAULT_ROOT documentation 
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
 2022-02-24 15:08:17 +01:00
Nicolas DuchonandJonathan Underwood efb250da01 fix: use most specific custom location config first 
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
 2022-02-24 15:08:17 +01:00
Nicolas DuchonandJonathan Underwood c75622db87 docs: fix typo in README.md 
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
 2022-02-24 15:08:17 +01:00
Nicolas Duchon 28c73e5b52 fix: non working https with virtual path 2022-02-24 15:07:49 +01:00
Nicolas Duchon 9cd85f61d5 build: build and push the dev branch to Dockerhub 2022-02-24 15:07:47 +01:00
Nicolas Duchon b6e9cdc065 ci: use docker-gen main on dev branch tests 2022-02-24 15:05:52 +01:00
Nicolas DuchonandGitHub 9cdb8047bf Merge pull request #1895 from seitenwerke/feature/add-container-logs 
Add container logs in case testcontainer exited unexpectedly
 2022-02-22 08:41:29 +01:00
Nicolas DuchonandGitHub 3670d39b71 docs: xip.io -> nip.io 2022-02-15 11:12:52 +01:00
Nicolas DuchonandGitHub 4c622708bd Merge pull request #1888 from nathanweeks/patch-1 
Fix path to default.conf in README.md
 2022-02-14 16:19:33 +01:00
Nicolas DuchonandGitHub 15e33a3de5 docs: suggest alternatives to xip.io 
Fixes #1887
 2022-02-14 16:18:25 +01:00
Nicolas DuchonandGitHub fdc90a49be Merge pull request #1886 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.0.1 
chore(deps): bump pytest from 7.0.0 to 7.0.1 in /test/requirements
 2022-02-14 09:07:18 +01:00
Nicolas DuchonandGitHub f70d81be66 Merge pull request #1882 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.0.0 
chore(deps): bump pytest from 6.2.5 to 7.0.0 in /test/requirements
 2022-02-07 09:05:41 +01:00
Nicolas DuchonandGitHub dbdf7d70e4 Merge pull request #1875 from nginx-proxy/dependabot/docker/nginx-1.21.6 
chore(deps): bump nginx from 1.21.5 to 1.21.6
 2022-02-03 12:40:55 +01:00
Nicolas Duchon 42c8b0c4c9 CI: replace maintainer label w/ OCI authors label 2022-01-14 14:39:33 +01:00
Nicolas Duchon 0ff39b804c ci: use git describe for OCI image version label 2022-01-14 14:29:03 +01:00
Nicolas Duchon 2daa09ff21 ci: upgrade to docker/metadata-action@v3 2022-01-14 14:17:21 +01:00
Nicolas DuchonandGitHub b411a84a59 docs: update issue template 2022-01-14 13:38:23 +01:00
Nicolas DuchonandGitHub 54dd5d1ef0 Merge pull request #1865 from nginx-proxy/container-version 
Add and display nginx-proxy version
 2022-01-13 12:22:08 +01:00
Nicolas Duchon dbca945a8f ci: add nginx-proxy version to image on build 2022-01-12 11:26:20 +01:00
Nicolas Duchon e22ae4a6fd tests: display container version 2022-01-12 10:17:49 +01:00
Nicolas Duchon fbf37456d0 feat: display container version 2022-01-11 22:38:30 +01:00
Nicolas Duchon fde0e809e4 chore: jwilder/docker-gen > nginx-proxy/docker-gen 2022-01-11 19:55:29 +01:00
Nicolas Duchon 679c971a19 docs: update maintainers list on license 2022-01-11 19:46:42 +01:00
Nicolas DuchonandGitHub 53ef90a2f6 docs: nginx badge 1.21.4 -> 1.21.5 2022-01-06 17:12:36 +01:00
Nicolas DuchonandGitHub ed7b17d9d7 Merge pull request #1856 from polarathene/tests/fix-container-networking 
tests: Fix pytest container networking issues
 2022-01-06 10:32:40 +01:00
Nicolas DuchonandGitHub 6260c0265e Merge pull request #1858 from nginx-proxy/dependabot/pip/test/requirements/requests-2.27.1 
chore(deps): bump requests from 2.26.0 to 2.27.1 in /test/requirements
 2022-01-06 10:24:17 +01:00
Nicolas DuchonandGitHub 780744f231 Merge pull request #1853 from nginx-proxy/dependabot/docker/nginx-1.21.5 
chore(deps): bump nginx from 1.21.4 to 1.21.5
 2021-12-31 13:58:44 +01:00
Nicolas DuchonandGitHub a96135b74d Merge pull request #1848 from polarathene/tests/dhparam-followup 
tests: Revise DH param tests
 2021-12-31 13:27:50 +01:00
Nicolas DuchonandGitHub 7c02ff637a Merge pull request #1843 from nginx-proxy/nginx-1.21.4 
Bump nginx to 1.21.4
 2021-12-15 14:02:25 +01:00
Nicolas Duchon 496e0f5f27 tests: mark test_deleted_cert as xfail 
test_delete_cert_and_restart_reverseproxy still fails intermitently
 2021-12-15 13:01:38 +01:00
Nicolas Duchon 8c909e7d11 build: nginx 1.21.3 -> 1.21.4 2021-12-15 11:53:37 +01:00
Nicolas DuchonandGitHub d29a53dc1f Merge pull request #1807 from ucyang/pr/remove-tab 
Remove unnecessary tabs
 2021-12-11 16:08:30 +01:00
Nicolas DuchonandGitHub a5eaf29c33 Merge pull request #1819 from HPPinata/main 
Clarify grammar in DH-GROUP section
 2021-11-05 17:39:39 +01:00
Nicolas DuchonandGitHub 83e3b25c46 Merge pull request #1797 from polarathene/feat/prefer-rfc-7919-dhparams 
feat: Use RFC 7919 DH groups + Remove DH generation
 2021-10-21 08:35:39 +02:00
Nicolas Duchon 36c4ed7632 test: replace test dhparam.pem with ffdhe3072.pem 2021-10-20 21:04:29 +02:00
Nicolas Duchon ab7ac0aadb fix: backward compatibility w/ DHPARAM_GENERATION 
Also use true rather than 1 to stay consistent
with other boolean environment variables
 2021-10-20 19:15:27 +02:00
Nicolas DuchonandGitHub 02396e3b58 Merge pull request #1791 from nginx-proxy/dependabot/pip/test/requirements/docker-5.0.3 
chore(deps): bump docker from 5.0.2 to 5.0.3 in /test/requirements
 2021-10-09 19:36:39 +02:00
Nicolas DuchonandGitHub 42cf18734f Merge pull request #1774 from nginx-proxy/dependabot/docker/nginx-1.21.3 
chore(deps): bump nginx from 1.21.1 to 1.21.3
 2021-09-30 19:17:25 +02:00
Nicolas DuchonandGitHub b133403331 Merge pull request #1775 from kevinnls/patch-1 
fix link
 2021-09-10 16:19:02 +02:00
Nicolas DuchonandGitHub 07abbb4c0d Merge pull request #1770 from crazy-max/path-context 
Use path context
 2021-09-08 16:05:20 +02:00
Nicolas DuchonandGitHub e166a93a56 Merge pull request #1764 from nginx-proxy/dependabot/pip/test/requirements/docker-5.0.2 
chore(deps): bump docker from 5.0.0 to 5.0.2 in /test/requirements
 2021-09-08 12:18:40 +02:00
Nicolas DuchonandGitHub 481c5a2318 Merge pull request #1760 from nginx-proxy/python-docker-mod-check 
Ease version check on python docker module for tests
 2021-09-01 14:48:35 +02:00
Nicolas Duchon a1ff28cec8 CI: ease version check on python docker module 2021-09-01 09:31:02 +02:00
Nicolas DuchonandGitHub 86c194e181 CI: disable fail-fast 2021-09-01 09:16:14 +02:00
Nicolas DuchonandGitHub 52d208daf3 Merge pull request #1756 from nginx-proxy/dependabot/pip/test/requirements/pytest-6.2.5 
chore(deps): bump pytest from 6.2.4 to 6.2.5 in /test/requirements
 2021-09-01 08:59:38 +02:00
Nicolas DuchonandGitHub 7bb3fd56c6 Merge pull request #1753 from mnahinkhan/patch-1 
Update README.md
 2021-08-30 11:14:37 +02:00
Nicolas DuchonandGitHub 8adbea8aec Merge pull request #1736 from nginx-proxy/predictable-upstream 
Revert to predictable upstream names, optional SHA1 names
 2021-08-19 12:36:13 +02:00
Nicolas Duchon a33af34361 docs: predictable vs SHA1 upstream names 2021-08-19 11:41:30 +02:00
Nicolas Duchon e748ffdce4 feat: sha1 upstream names 2021-08-17 21:51:09 +02:00
Nicolas Duchon d10531e925 tests: predictable upstream names 2021-08-17 21:50:18 +02:00
Nicolas DuchonandGitHub ded3cfc168 docs: don't prefix copy pastable commands with $ 
+ other small markdown fixes
 2021-08-17 11:29:21 +02:00
Nicolas Duchon eb3bb2ab07 docs: fix line feeds 2021-08-17 11:13:31 +02:00
Nicolas DuchonandGitHub 0e3844ad1e Merge pull request #1725 from nginx-proxy/fix-1693 
Use sha1 of hostname as upstream names
 2021-08-11 17:54:29 +02:00
Nicolas DuchonandGitHub b6bd9e24a8 Merge pull request #1726 from nginx-proxy/dependabot/docker/golang-1.16.7 
chore(deps): bump golang from 1.16.6 to 1.16.7
 2021-08-08 14:10:10 +02:00
Nicolas Duchon 89d37882b6 fix: always use sha1 of hostname as upstream name 2021-08-04 22:28:00 +02:00
Nicolas Duchon ba86bc04f6 tests: check for raw IPv4/6 used as VIRTUAL_HOST 2021-08-04 22:25:55 +02:00
Nicolas DuchonandGitHub 39a59e6168 Merge pull request #1724 from nginx-proxy/dockergen-0.7.7 
Bump docker-gen from 0.7.6 to 0.7.7
 2021-08-04 10:34:55 +02:00
Nicolas Duchon 8526d918ed style: Dockerfiles linting 2021-08-04 08:49:23 +02:00
Nicolas Duchon 897e4135d3 build: docker-gen 0.7.6 -> 0.7.7 2021-08-04 08:48:25 +02:00
Nicolas Duchon df638c3fe6 ci: cleanup left over volumes after tests 2021-08-02 19:31:36 +02:00
Nicolas Duchon 10a4db5067 ci: remove xfail from tests that were fixed 2021-08-02 19:08:06 +02:00
Nicolas Duchon d3fc5c506a ci: enable Docker IPv6 on tests that require it 2021-08-02 18:37:33 +02:00
Nicolas Duchon 795e0acda7 ci: remove InsecureRequestWarning from urllib3 2021-08-02 18:09:34 +02:00
Nicolas DuchonandGitHub caab609f5d Merge pull request #1723 from nginx-proxy/ci-pip-docker 
Update docker and docker-compose pip packages
 2021-08-02 15:11:44 +02:00
Nicolas Duchon 90a7218622 ci: update contest.py 2021-08-02 14:48:40 +02:00