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
1,015 Commits 3 Branches 6 Tags
442e577c0ef2dda4aac9650f1064a858b88d722b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas DuchonandGitHub 0501c54002 build: get docker-gen from pre-built image (#2230) 
* build: get docker-gen from pre-built image

* build: requested changes
 2023-05-02 05:21:41 +02:00
Nicolas DuchonandGitHub c337a13847 Merge pull request #2229 from nginx-proxy/workflow-rename 
ci: rename build / publish workflow
 2023-04-30 16:34:23 +02:00
Nicolas Duchon eabb808b85 ci: rename build / publish workflow 2023-04-30 15:51:46 +02:00
Nicolas DuchonandGitHub 0853fada32 Merge pull request #2228 from nginx-proxy/dependabot/github_actions/docker/build-push-action-4 
ci: bump docker/build-push-action from 3 to 4
 2023-04-30 15:41:13 +02:00
Nicolas DuchonandGitHub 2218f98af2 Merge pull request #2227 from nginx-proxy/dependabot/github_actions/actions/setup-python-4 
ci: bump actions/setup-python from 2 to 4
 2023-04-30 15:40:59 +02:00
Nicolas DuchonandGitHub 4655ba9f51 ci: only trigger test workflow on push for main branch 2023-04-30 15:30:29 +02:00
Nicolas DuchonandGitHub 4a096a25a8 Merge pull request #2226 from nginx-proxy/dependabot-actions 
ci: maintain GitHub Actions with Dependabot
 2023-04-30 15:16:53 +02:00
Nicolas Duchon 43eed7d0df ci: check test suite dependencies weekly 2023-04-30 15:02:44 +02:00
Nicolas Duchon 21321a4495 ci: add GitHub Actions to Dependabot config 2023-04-30 15:02:09 +02:00
Nicolas DuchonandGitHub 6ef3196d30 Merge pull request #2225 from nginx-proxy/dependabot/pip/test/requirements/requests-2.29.0 
ci: bump requests from 2.28.2 to 2.29.0 in /test/requirements
 2023-04-27 18:41:07 +02:00
Nicolas DuchonandGitHub b4efff04b7 Merge pull request #2220 from nginx-proxy/docker-gen-0.10.4 
build: dockergen 0.10.3 -> 0.10.4
 2023-04-18 08:10:11 +02:00
Nicolas DuchonandGitHub 9f735aab82 build: dockergen 0.10.3 -> 0.10.4 2023-04-18 07:58:38 +02:00
Nicolas DuchonandGitHub ff676b519e Merge pull request #2219 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.3.1 
ci: bump pytest from 7.3.0 to 7.3.1 in /test/requirements
 2023-04-18 07:20:04 +02:00
Nicolas DuchonandGitHub 1f3508e6df Merge pull request #2216 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.3.0 
ci: bump pytest from 7.2.2 to 7.3.0 in /test/requirements
 2023-04-10 07:35:41 +02:00
Nicolas DuchonandGitHub 7322a2d542 Merge pull request #2213 from nginx-proxy/dependabot/docker/golang-1.20.3-alpine 
build: bump golang from 1.20.2-alpine to 1.20.3-alpine
 2023-04-05 07:19:43 +02:00
Nicolas DuchonandGitHub 130fd908fb docs: update nginx version badge 2023-03-30 20:58:56 +02:00
Nicolas DuchonandGitHub 3039d85ee7 Merge pull request #2206 from nginx-proxy/dependabot/docker/nginx-1.23.4-alpine 
build: bump nginx from 1.23.3-alpine to 1.23.4-alpine
 2023-03-30 20:58:00 +02:00
Nicolas DuchonandGitHub c35368007e Merge pull request #2207 from nginx-proxy/docker-gen-0.10.3 
build: docker-gen 0.10.2 -> 0.10.3
 2023-03-30 01:25:27 +02:00
Nicolas DuchonandGitHub 2056dc4429 build: dockergen 0.10.2 -> 0.10.3 2023-03-30 01:10:05 +02:00
Nicolas DuchonandGitHub 0d9cd2b45c Merge pull request #2186 from rhansen/fallback 
fix: Improve handling of unknown hosts and missing certs
 2023-03-24 14:18:52 +01:00
Nicolas DuchonandGitHub 55d53e6659 Merge pull request #1934 from rhansen/keepalive 
feat: Add support for HTTP keep-alive between the proxy and upstream
 2023-03-21 07:31:13 +01:00
Nicolas DuchonandGitHub 6c2d17586b Merge pull request #2200 from nginx-proxy/docker-gen-0.10.2 
build: dockergen 0.10.1 -> 0.10.2
 2023-03-21 07:27:48 +01:00
Nicolas DuchonandGitHub 4696944245 build: dockergen 0.10.1 -> 0.10.2 2023-03-21 07:15:34 +01:00
Nicolas DuchonandGitHub 1f855fc7b3 Merge pull request #2191 from rhansen/nil-currentcontainer 
fix: Don't error if `$globals.CurrentContainer` is `nil`
 2023-03-14 06:49:21 +01:00
Nicolas DuchonandGitHub abcef6be86 Merge pull request #2184 from nginx-proxy/dockergen-0.10.1 
build: dockergen 0.10.0 -> 0.10.1
 2023-02-28 08:50:19 +01:00
Nicolas DuchonandGitHub 6e9d46e672 Merge pull request #2164 from rhansen/tests 
chore: minor test improvements
 2023-02-28 08:49:12 +01:00
Nicolas DuchonandGitHub 16b8cde8e4 build: dockergen 0.10.0 -> 0.10.1 2023-02-28 08:36:27 +01:00
Nicolas DuchonandGitHub afd6544702 Merge pull request #2179 from rhansen/swarm 
fix: Partially revert "chore: Remove support for legacy swarm"
 2023-02-28 07:40:16 +01:00
Nicolas DuchonandGitHub bc2ada1f44 Merge pull request #2163 from nginx-proxy/dockergen-0.10.0 
build: dockergen 0.9.4 -> 0.10.0
 2023-02-09 08:28:09 +01:00
Nicolas DuchonandGitHub c10c7bcbe9 build: dockergen 0.9.4 -> 0.10.0 2023-02-09 08:10:43 +01:00
Nicolas DuchonandGitHub 41e025f0f0 Merge pull request #2159 from rhansen/refactor 
chore: Factor out container IP:port lookup
 2023-02-09 08:01:26 +01:00
Nicolas DuchonandGitHub 1462ff019d Merge pull request #1179 from harvdogg/master 
Allow complete override of location blocks
 2023-02-01 07:42:42 +01:00
Nicolas DuchonandGitHub 8ac8b021b8 Merge pull request #2155 from rhansen/docker-pull 
chore: Pass `--pull` to `docker build` to get fresh images
 2023-01-30 07:57:44 +01:00
Nicolas DuchonandGitHub 926bd43cff Merge pull request #2153 from rhansen/upstream-cleanup 
fix: Generate at most one `server` directive per container
 2023-01-30 07:56:50 +01:00
Nicolas DuchonandGitHub d3ded293ac Merge pull request #2147 from nginx-proxy/dockergen-0.9.4 
build: dockergen 0.9.3 -> 0.9.4
 2023-01-24 00:27:54 +01:00
Nicolas DuchonandGitHub fa52426d54 ci: set Dependabot commit prefixs 2023-01-23 23:24:58 +01:00
Nicolas Duchon 8df67cdde8 build: dockergen 0.9.3 -> 0.9.4 2023-01-23 23:14:42 +01:00
Nicolas DuchonandGitHub 1775420592 Merge pull request #2140 from rhansen/tests 
Minor test fixes
 2023-01-18 08:02:02 +01:00
Nicolas DuchonandGitHub 5d22134ee6 Merge pull request #2137 from nginx-proxy/dockergen-0.9.3 
build: dockergen 0.9.2 -> 0.9.3
 2023-01-17 08:35:18 +01:00
Nicolas DuchonandGitHub b16ad27878 build: dockergen 0.9.2 -> 0.9.3 2023-01-17 08:17:02 +01:00
Nicolas DuchonandGitHub 017a731302 Merge pull request #2127 from rhansen/chores 
Various code health chores
 2023-01-17 07:44:57 +01:00
Nicolas DuchonandGitHub 2f898566fc Merge pull request #2121 from rhansen/patch-X-Forwarded-Host 
feat: Add proxy header `X-Forwarded-Host`
 2022-12-27 09:58:48 +01:00
Nicolas DuchonandGitHub 6f4f9ec20c Merge pull request #1927 from rhansen/untrusted-headers 
feat: Option to not trust `X-Forwarded-*` headers from clients
 2022-12-26 20:47:05 +01:00
Nicolas DuchonandGitHub 7c0d38cd2e Merge pull request #1985 from hiqdev/networks-order 
Make sure networks order is the same
 2022-12-26 16:59:41 +01:00
Nicolas DuchonandGitHub cb82aad4c0 Merge pull request #2118 from nginx-proxy/dockergen-0.9.2 
build: dockergen 0.9.1 -> 0.9.2
 2022-12-23 19:53:27 +01:00
Nicolas Duchon ba8f5a4eb8 build: dockergen 0.9.1 -> 0.9.2 2022-12-23 19:45:04 +01:00
Nicolas DuchonandGitHub ee0d68c34e docs: nginx badge 1.23.2 -> 1.23.3 2022-12-23 19:42:48 +01:00
Nicolas DuchonandGitHub 216e0b5e12 Merge pull request #2110 from nginx-proxy/dependabot/docker/golang-1.19.4 
chore(deps): bump golang from 1.18.8 to 1.19.4
 2022-12-23 19:41:21 +01:00
Nicolas DuchonandGitHub aadeabe4a6 Merge pull request #2115 from nginx-proxy/dependabot/docker/nginx-1.23.3 
chore(deps): bump nginx from 1.23.2 to 1.23.3
 2022-12-21 00:24:14 +01:00
Nicolas Duchon 9c2b2cec38 ci: use actions/checkout@v3 2022-12-03 19:36:31 +01:00
Nicolas Duchon 9f9e5b8cd4 ci: update Actions versions 2022-12-03 14:34:15 +01:00
Nicolas Duchon 02d3a37cfb style: linting on CI yaml files 2022-12-03 14:30:40 +01:00
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