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

88 Commits

Author SHA1 Message Date
987c996173 Merge pull request #1641 from nginx-proxy/dependabot/docker/nginx-1.21.0
chore(deps): bump nginx from 1.19.10 to 1.21.0
2021-06-14 13:47:26 +02:00
1967ca2a57 chore(deps): bump golang from 1.15.10 to 1.16.5
Bumps golang from 1.15.10 to 1.16.5.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 23:28:24 +00:00
ae5623916b chore(deps): bump nginx from 1.19.10 to 1.21.0
Bumps nginx from 1.19.10 to 1.21.0.

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 23:28:15 +00:00
7f2307626d Merge pull request #1603 from nginx-proxy/forego
Chore: switch to go mod compatible fork of forego
2021-06-09 01:27:31 +02:00
242caf9e69 chore: switch to go mod compatible fork of forego 2021-06-09 01:18:02 +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
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
f8aa9a1637 chore: bump docker-gen from 0.7.4 to 0.7.6 2021-04-26 14:55:33 +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
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
ea28f2f32f Upgrade Nginx to 1.19.3 2020-10-08 19:05:47 -07:00
6798a6b800 Upgrade to 1.17.8 2020-02-28 16:36:36 +01:00
77227f8691 Upgrade nginx to 1.17.6 2019-12-04 10:19:17 -05:00
cf911d950a Upgrade to 1.17.5
closes #1337, resolves #1355
2019-11-08 14:11:17 +01:00
a4cc268628 Use nginx 1.17.3 2019-08-18 11:20:05 +02:00
16169a0f74 Use nginx latest version 2019-08-07 17:32:52 +01:00
58c1fe3606 Upgrade to nginx 1.14.1 stable version 2018-11-09 15:26:01 +01:00
cb2b0e2bd3 Upgrade to nginx 1.14 stable 2018-06-06 00:56:47 +02:00
4932ef3036 Upd: Boost worker_connections from 1024 to 10240. 2018-02-07 15:30:26 +01:00
32d42ffee7 Update docker-gen to 0.7.4 2018-01-14 15:28:46 -07:00
55610b8425 MAINTAINER is deprecated, using LABEL now 2017-10-31 18:21:12 -07:00
93d90884e2 Implemented NETWORK_ACCESS (squash commit) 2017-10-18 13:29:12 -04:00
febf85d7e2 Move to 1.13 base image to get auto updates
Less maintenance and more security
Resolves #880
2017-07-21 13:45:33 +02:00
761bbf9dbc Removed duplicate server_names_hash_bucket_size directive 2017-06-18 21:21:05 -04:00
c41186a3a4 Merge branch 'master' into feature_ssl_improvement 2017-06-14 16:31:12 -06:00
1867228cce fix worker_processes to "auto" 2017-06-12 15:59:55 +08:00
2c4102d396 Upgrade to 1.13.0 2017-05-04 18:57:00 +02:00
172d79aff4 Upgrade to nginx 1.11.13 2017-04-07 12:58:49 +02:00
ad9af2884d Merged master, fixed BATS conflict 2017-03-06 10:48:12 -05:00
7bafa37a52 Upgrade to nginx 1.11.10 2017-02-21 14:03:54 +01:00
15cbb5debf Upgrade to nginx 1.11.9 2017-02-05 21:40:29 +01:00
dfdd67f5a4 Implemented background dhparam generation 2017-01-11 22:43:09 -05:00
f186815c2d Merged upstream 2017-01-11 22:42:35 -05:00
004cc3cb8c Upgrade to nginx 1.11.8 2016-12-28 23:38:47 +01:00
b66398d1bf Updated nginx to 1.11.6 2016-12-08 13:24:49 -06:00
b0de80d46b Moved config edits from Dockerfile to template 2016-10-03 10:21:31 -04:00
8534185b0c Added newline to config 2016-10-03 10:05:55 -04:00
0b1e9e56e1 Issue #535 Added default 2048-bit dhparam.pem file 2016-09-29 16:48:18 -04:00
03e863d838 upgrade nginx to 1.11.3 2016-08-25 20:16:37 +02:00
86c408bbdd upgrade nginx to 1.11.0 2016-07-29 21:17:14 +02:00
8ed5ab38b8 Update to docker-gen 0.7.3 2016-06-13 00:24:21 -06:00
c256f31728 Update nginx 1.9.15 2016-06-10 20:08:10 -06:00
d40d1d4052 Update to docker-gen 0.7.1 2016-05-04 14:51:30 -06:00
a54af7d73b Switch forego downloads
Official ddollar site has been down for a while and not sure if it's
coming back up or not.
2016-04-04 16:48:52 -06:00
86aea653c8 Update to docker-gen 0.7.0
Since [1] some timings seem to have changed. This caused the unit tests
to fail intermittently, from my testings especially on Ubuntu systems
(much less often on e.g. Arch).

This commit adds the `dockergen_wait_for_event` helper-function to try
and wait for the configuration to be generated by docker-gen before
continuing on with the actual tests themselves.

Additionally, at the end of every test file, all containers spun up by
the bats-tests will be stopped. This required adding the `bats-type`
label to every container started during the bats-tests.

The stopping of the containers reduces the amount of events docker-gen
has to process, thus resulting in lower wait times for the generation to
happen.

[1]: 50435652b1
2016-03-23 17:45:34 +01:00
1f8b480365 moved nginx to 1.9.12 2016-03-21 22:47:01 +01:00
627f789f19 updated nginx to 1.9.9 2016-01-20 23:26:21 +01:00
588cdf6266 Update email address 2015-10-29 13:32:09 -06:00
5404938797 Update to nginx 1.9.6 2015-10-28 21:29:39 -07:00