1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-07-01 06:15:45 +00:00
Commit Graph

752 Commits

Author SHA1 Message Date
85327a871e Suffix upstream names to prevent confusion with FQDNs 2021-04-29 02:21:19 +02:00
e3cc439ff0 doc: bring badges in line with acme-companion 2021-04-28 22:43:40 +02:00
35df872705 Merge pull request #973 from Sparted/master
Upd: Boost worker_connections from 1024 to 10240.
2021-04-28 21:39:57 +02:00
1f937dd6a5 docs: don't mention Docker container based tests
Those aren't working yet and are being worked on
close #1605
2021-04-28 09:58:03 +02:00
f7444094ca ci: remove Travis CI 2021-04-27 01:12:28 +02:00
0d2efaee95 docs: update nginx version and CI badge 2021-04-27 01:10:17 +02:00
a6f4bfa15b Merge pull request #1590 from nginx-proxy/dependabot/docker/nginx-1.19.10 2021-04-26 22:50:19 +00:00
5e4f005240 Bump nginx from 1.19.3 to 1.19.10
Bumps nginx from 1.19.3 to 1.19.10.

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 22:44:46 +00:00
aa9386129d Merge pull request #1572 from kmarilleau/travis_to_github_actions
Travis to GitHub actions
2021-04-27 00:42:21 +02:00
1518c39e1b docs: update "how to install/test" parts 2021-04-27 00:35:21 +02:00
39f822dd8b refactor(ci): ♻️ refactor makefile and modify its usage on CI 2021-04-27 00:35:21 +02:00
1591fd7968 chore(ci): 💚 use standard python for nginx-proxy-tester 2021-04-27 00:35:21 +02:00
3b1163291b fix(test): test_dockergen_v3 version comparison 2021-04-27 00:35:21 +02:00
dd853b2572 chore(ci): 👷 mv unit test from travis to ga 2021-04-27 00:35:20 +02:00
dd7f7e8427 fix(ci): wrong nginx-proxy image used on default_host test 2021-04-27 00:35:20 +02:00
0c60d57031 fix(ci): fix test_dhparam_is_generated_if_missing 2021-04-27 00:35:20 +02:00
6fd3cfb38f fix(ci): 🔧 add markers on pytest.ini to fix warnings 2021-04-27 00:35:20 +02:00
37e85e6e8d chore(ci): ♻️ convert Python old % string to f-strings 2021-04-27 00:35:20 +02:00
eba9ac4261 chore(ci): ⬆️ update python dependencies to latests release 2021-04-27 00:35:19 +02:00
950a28f5ea chore(ci): ⬆️ porting python 2.7 code to python 3.9 2021-04-27 00:35:19 +02:00
fe79dd4cd3 Merge pull request #1601 from nginx-proxy/dockergen-0.7.6
Bump docker-gen from 0.7.4 to 0.7.6
2021-04-26 15:09:55 +02:00
f8aa9a1637 chore: bump docker-gen from 0.7.4 to 0.7.6 2021-04-26 14:55:33 +02:00
eac17ac03c Merge pull request #1599 from tkw1536/patch-1
Remove Google Forum Link from Issue Template
2021-04-21 23:45:32 +02:00
cfa9cf31d7 Remove Google Forum Link from Issue Template
The Google Forum no longer exists. Therefore the link to it in the issue template should be removed.
2021-04-21 21:04:45 +02:00
6613e272eb ci: rebuild and push the latest image on schedule
Rebuild and push the last commit of the default branch every monday at 00:00 UTC
2021-04-07 17:10:37 +02:00
9efeb5d8af ci: build the debian and alpine images in parallel 2021-04-06 00:11:53 +02:00
24565440b2 docs: update DockerHub shields 2021-04-05 13:56:14 +02:00
bdf62b025b docs: follow acme-companion name change 2021-04-05 13:16:40 +02:00
c3bb234871 chore: rename default branch master -> main 2021-04-05 13:13:20 +02:00
6e17d6ff7b Merge pull request #1505 from ecerutti/patch-1
Update README.md
2021-04-05 09:57:53 +02:00
2b32f44454 Merge pull request #1145 from kfkonrad/master
Clarify default host usage
2021-04-05 09:50:34 +02:00
0f427dd32d Merge pull request #1184 from kylegoetz/master
Update README.md - sample yml needed expose option
2021-04-05 09:46:40 +02:00
21caa570fb Merge pull request #1332 from ArgonQQ/patch-1
Will fix spelling
2021-04-05 09:31:18 +02:00
fcfe17a0a4 Merge pull request #1538 from S0obi/patch-1
Update docker-entrypoint.sh comment on DHPARAM default key size
2021-04-02 01:49:36 +02:00
d120ce9fde ci: push images to jwilder/nginx-proxy 2021-04-02 00:39:41 +02:00
4a1d5bfc58 ci: build and push for arm64 and arm/v7 archs 2021-04-01 22:23:37 +02:00
bea149e317 ci: create dependabot config for Docker ecosystem 2021-04-01 21:06:33 +02:00
65b44f0ca2 Merge pull request #1470 from KWARC/build-from-scratch
Enable multi-architecture docker image builds
2021-04-01 19:08:23 +02:00
ad7c02570b chore: use nginxproxy's DockerHub registry
Transitioning away from jwilder/nginx-proxy
Please see #1304 for more details
2021-04-01 16:06:09 +02:00
83ca0511d1 Hardcode nginx 1.19.3 for use in Docker Images
This commit updates both 'Dockerfile' and 'Dockerfile.alpine' to use
'nginx 1.19.3'. This change was implemented after feedback from @buchdag
to be able to use dependabot.
2021-04-01 15:54:26 +02:00
6b8cd894da Hardcode go 1.15.10 for use in Docker Images
This commit updates both 'Dockerfile' and 'Dockerfile.alpine' to use
'go.15.10' when building the dependencies. This change was implemented
after feedback from @buchdag to be able to use dependabot.
2021-04-01 13:54:37 +02:00
3a8b49f153 ci: build and push to DockerHub w/ GitHub Actions 2021-04-01 12:14:32 +02:00
886dd04b62 Enable multi-architecture docker image builds
Previously, the Dockerfile downloaded 'docker-gen' and 'forego' binaries
during build time. This caused a problem as it hard-coded the amd64
architecture for the images.

This commit updates both 'Dockerfile' and 'Dockerfile.alpine' to build
the `forego` and `docker-gen` executables from scratch instead of
downloading binaries directly.

This is achieved using multi-stage builds [1]. Two seperate stages first
build the binaries, and are then copied over to the final stage.

The advantage of this change is two-fold: First, it enables building
this image on architectures other than amd64. Secondly it adds trust by
not adding external binaries to the docker image.

This modified version passes the test both a linux desktop (amd64) as
well as a raspberry pi (armv7) with some caveats:

- On armv7, a modified version of the `jwilder/docker-gen` image is
required. See a seperate PR at [2].

- The 'test_dhparam_is_generated_if_missing' test fails. This also
doesn't currently pass on master.

[1] https://docs.docker.com/develop/develop-images/multistage-build/ [2]
https://github.com/jwilder/docker-gen/pull/327
2021-03-21 12:31:06 +01:00
bf2d7295d3 Merge pull request #1409 from nginx-proxy/no-https-redirect-acme
Bring ACME no redirection inline with companion
2021-03-17 20:31:37 +01:00
1a0d0d822e update IPv6 section in README 2021-02-06 18:56:30 +00:00
2bde43c6e9 remove scoped ipv6 resolvers 2021-02-05 19:56:56 +00:00
8d0ab90536 Update README for DHParam default size 2020-12-06 19:09:55 +01:00
aba100ff7b Update docker-entrypoint.sh
Default key size is not 2048 anymore but 4096, reference : https://github.com/nginx-proxy/nginx-proxy/blob/master/generate-dhparam.sh#L4
2020-12-02 13:18:32 +01:00
c8a6785898 Update version to 0.8.0 2020-10-30 10:19:56 -06:00
20cc3527b4 Merge pull request #1508 from lemker/master
Upgrade Nginx to 1.19.3
2020-10-08 20:17:32 -06:00