PROXY Protocol support (rd 2)

[adrum]

This is essentially #1882 with the merge conflicts resolved.

I first tried submitting a PR to the source branch, but it's not yet been merged. SBado#1

I thought I might have better luck here 😄

[adrum]

cc @Iaotle

[nginxproxymanagerci]

CI Error:

/bin/bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
certbot-node: Pulling from nginxproxymanager/nginx-full
Digest: sha256:140efb3dae2847971a6e81eab4c5aa4e41582a3c563e64d6435c8c9106c2a035
Status: Image is up to date for nginxproxymanager/nginx-full:certbot-node
docker.io/nginxproxymanager/nginx-full:certbot-node
�[1;34m❯ �[1;36mTesting backend ...�[0m
yarn install v1.22.22
[1/4] Resolving packages...
[2/4] Fetching packages...
[3/4] Linking dependencies...
warning " > @apidevtools/[email protected]" has unmet peer dependency "openapi-types@>=7".
[4/4] Building fresh packages...
Done in 41.09s.
yarn run v1.22.22
$ /app/node_modules/.bin/eslint .
Done in 0.94s.
�[1;34m❯ �[1;32mTesting Complete�[0m
�[1;34m❯ �[1;36mBuilding ...�[0m
#0 building with "default" instance using docker driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 2.35kB done
#1 DONE 0.0s

#2 [internal] load metadata for docker.io/nginxproxymanager/nginx-full:certbot-node
#2 DONE 1.6s

#3 [internal] load metadata for docker.io/nginxproxymanager/testca:latest
#3 DONE 1.7s

#4 [internal] load metadata for docker.io/letsencrypt/pebble:latest
#4 DONE 1.6s

#5 [internal] load .dockerignore
#5 transferring context: 2B done
#5 DONE 0.0s

#6 [testca 1/1] FROM docker.io/nginxproxymanager/testca:latest@sha256:e4ddbcecaad278c32d743bbc2561cbbf630b180ec892b264e2f3d0dd1ccc9825
#6 resolve docker.io/nginxproxymanager/testca:latest@sha256:e4ddbcecaad278c32d743bbc2561cbbf630b180ec892b264e2f3d0dd1ccc9825 done
#6 extracting sha256:8921db27df2831fa6eaa85321205a2470c669b855f3ec95d5a3c2b46de0442c9
#6 sha256:e4ddbcecaad278c32d743bbc2561cbbf630b180ec892b264e2f3d0dd1ccc9825 990B / 990B done
#6 sha256:0670db9715a8b316a642fef01af1d624cc7fcace73104fc340d03d90949c6fd7 4.19MB / 4.90MB 0.1s
#6 sha256:6da8cff2ab8b03d779f901005b7105535da468b74d8312c9423fb92ca5bf5bd7 1.05MB / 11.54MB 0.1s
#6 sha256:4a071de10b00383e7898444554ea2f4cff773b75e4d4731c3c710392366b0608 2.67kB / 2.67kB done
#6 sha256:c71d090ada31f639dae02f942bcff98aeb293cd7716b33248f95d98581733429 8.16kB / 8.16kB done
#6 sha256:29a33b00fed07d7a3f9275422f37a913a0b42d9850ccfb68156ddd1d0369246f 0B / 12.21MB 0.1s
#6 sha256:8921db27df2831fa6eaa85321205a2470c669b855f3ec95d5a3c2b46de0442c9 3.37MB / 3.37MB 0.1s done
#6 sha256:4f4fb700ef54461cfa02571ae0db9a0dc1e0cdb5577484a6d75e68dc38e8acc1 32B / 32B 0.1s done
#6 ...

#7 [internal] load build context
#7 transferring context: 7.74MB 0.1s done
#7 DONE 0.1s

#8 [stage-2  1/13] FROM docker.io/nginxproxymanager/nginx-full:certbot-node@sha256:140efb3dae2847971a6e81eab4c5aa4e41582a3c563e64d6435c8c9106c2a035
#8 resolve docker.io/nginxproxymanager/nginx-full:certbot-node@sha256:140efb3dae2847971a6e81eab4c5aa4e41582a3c563e64d6435c8c9106c2a035 done
#8 DONE 0.1s

#6 [testca 1/1] FROM docker.io/nginxproxymanager/testca:latest@sha256:e4ddbcecaad278c32d743bbc2561cbbf630b180ec892b264e2f3d0dd1ccc9825
#6 extracting sha256:8921db27df2831fa6eaa85321205a2470c669b855f3ec95d5a3c2b46de0442c9 0.1s done
#6 sha256:0670db9715a8b316a642fef01af1d624cc7fcace73104fc340d03d90949c6fd7 4.90MB / 4.90MB 0.1s done
#6 sha256:6da8cff2ab8b03d779f901005b7105535da468b74d8312c9423fb92ca5bf5bd7 3.15MB / 11.54MB 0.2s
#6 sha256:29a33b00fed07d7a3f9275422f37a913a0b42d9850ccfb68156ddd1d0369246f 5.24MB / 12.21MB 0.2s
#6 sha256:fe33f2ec4fc5b184aad3dd8307abf843cebd01e3233ca6da2d99b963d887e9d3 2.10MB / 6.69MB 0.2s
#6 extracting sha256:0670db9715a8b316a642fef01af1d624cc7fcace73104fc340d03d90949c6fd7
#6 sha256:6da8cff2ab8b03d779f901005b7105535da468b74d8312c9423fb92ca5bf5bd7 8.39MB / 11.54MB 0.4s
#6 sha256:29a33b00fed07d7a3f9275422f37a913a0b42d9850ccfb68156ddd1d0369246f 12.21MB / 12.21MB 0.3s done
#6 sha256:fe33f2ec4fc5b184aad3dd8307abf843cebd01e3233ca6da2d99b963d887e9d3 6.69MB / 6.69MB 0.3s done
#6 sha256:81ee1134816c917968d1534262c5066b42f9d62a7b05be82e7b33c20d07fc753 2.87kB / 2.87kB 0.4s done
#6 sha256:0ed75c6b32e822b75139354a8de6de9fd4bc2ceedd39a85b2554cae17a6edb7f 0B / 122B 0.4s
#6 sha256:b7d4789d852064ebf61c8589f9a13e53390524f8dda43864d36bbfdd8363e750 5.24MB / 12.30MB 0.4s
#6 sha256:1548069acf510946fd1a6ef4258005191af432fa551056f3b87860d938cc4f2f 1.16kB / 1.16kB 0.3s done
#6 sha256:a84b6ba190dd1d5400fff935d69fe387b887febb8b0c064dfc49a3ce9f925c55 51.07kB / 51.07kB 0.4s done
#6 sha256:6da8cff2ab8b03d779f901005b7105535da468b74d8312c9423fb92ca5bf5bd7 11.54MB / 11.54MB 0.5s
#6 sha256:0ed75c6b32e822b75139354a8de6de9fd4bc2ceedd39a85b2554cae17a6edb7f 122B / 122B 0.4s done
#6 sha256:b7d4789d852064ebf61c8589f9a13e53390524f8dda43864d36bbfdd8363e750 9.83MB / 12.30MB 0.5s
#6 sha256:8013759f7522b8b1357b2de70bc0629a90b3714569a359a17f1ef1dc520c10ef 2.10MB / 3.91MB 0.5s
#6 sha256:6da8cff2ab8b03d779f901005b7105535da468b74d8312c9423fb92ca5bf5bd7 11.54MB / 11.54MB 0.5s done
#6 sha256:b7d4789d852064ebf61c8589f9a13e53390524f8dda43864d36bbfdd8363e750 12.30MB / 12.30MB 0.5s done
#6 sha256:8013759f7522b8b1357b2de70bc0629a90b3714569a359a17f1ef1dc520c10ef 3.91MB / 3.91MB 0.5s done
#6 extracting sha256:0670db9715a8b316a642fef01af1d624cc7fcace73104fc340d03d90949c6fd7 0.4s done
#6 extracting sha256:6da8cff2ab8b03d779f901005b7105535da468b74d8312c9423fb92ca5bf5bd7 0.1s
#6 ...

#9 [pebbleca 1/1] FROM docker.io/letsencrypt/pebble:latest@sha256:fc5a537bf8fbc7cc63aa24ec3142283aa9b6ba54529f86eb8ff31fbde7c5b258
#9 resolve docker.io/letsencrypt/pebble:latest@sha256:fc5a537bf8fbc7cc63aa24ec3142283aa9b6ba54529f86eb8ff31fbde7c5b258 done
#9 sha256:fc5a537bf8fbc7cc63aa24ec3142283aa9b6ba54529f86eb8ff31fbde7c5b258 1.16kB / 1.16kB done
#9 sha256:7213864a87a0d58cd6f4e25a8a782209cb1017b52790ac885bcdf319676d1a59 2.65kB / 2.65kB done
#9 extracting sha256:486039affc0ad0f17f473efe8fb25c947515a8929198879d1e64210ef142372f 0.1s done
#9 sha256:486039affc0ad0f17f473efe8fb25c947515a8929198879d1e64210ef142372f 2.21MB / 2.21MB 0.6s done
#9 sha256:6af14ad7d163168b97c2e5d1777436394a04d5ef75b06bad055be88b8cffb584 1.58MB / 1.58MB 0.6s done
#9 sha256:8efc02cf298aee75e88bf479ded226f369d14819af67ec1ae0a570508ffa71c5 5.37MB / 5.37MB 0.6s done
#9 sha256:53206f87bf7701c9b971734dc7c21bb9284ba147e7de1d4c40e890b84ca371ff 8.52kB / 8.52kB 0.6s done
#9 extracting sha256:6af14ad7d163168b97c2e5d1777436394a04d5ef75b06bad055be88b8cffb584 0.1s done
#9 extracting sha256:8efc02cf298aee75e88bf479ded226f369d14819af67ec1ae0a570508ffa71c5 0.1s done
#9 extracting sha256:53206f87bf7701c9b971734dc7c21bb9284ba147e7de1d4c40e890b84ca371ff done
#9 DONE 0.9s

#6 [testca 1/1] FROM docker.io/nginxproxymanager/testca:latest@sha256:e4ddbcecaad278c32d743bbc2561cbbf630b180ec892b264e2f3d0dd1ccc9825
#6 extracting sha256:6da8cff2ab8b03d779f901005b7105535da468b74d8312c9423fb92ca5bf5bd7 0.2s done
#6 extracting sha256:4f4fb700ef54461cfa02571ae0db9a0dc1e0cdb5577484a6d75e68dc38e8acc1 done
#6 extracting sha256:29a33b00fed07d7a3f9275422f37a913a0b42d9850ccfb68156ddd1d0369246f
#6 extracting sha256:29a33b00fed07d7a3f9275422f37a913a0b42d9850ccfb68156ddd1d0369246f 0.2s done
#6 extracting sha256:fe33f2ec4fc5b184aad3dd8307abf843cebd01e3233ca6da2d99b963d887e9d3 0.1s done
#6 extracting sha256:b7d4789d852064ebf61c8589f9a13e53390524f8dda43864d36bbfdd8363e750 0.1s
#6 extracting sha256:b7d4789d852064ebf61c8589f9a13e53390524f8dda43864d36bbfdd8363e750 0.2s done
#6 extracting sha256:1548069acf510946fd1a6ef4258005191af432fa551056f3b87860d938cc4f2f done
#6 extracting sha256:81ee1134816c917968d1534262c5066b42f9d62a7b05be82e7b33c20d07fc753 done
#6 extracting sha256:a84b6ba190dd1d5400fff935d69fe387b887febb8b0c064dfc49a3ce9f925c55 done
#6 extracting sha256:0ed75c6b32e822b75139354a8de6de9fd4bc2ceedd39a85b2554cae17a6edb7f done
#6 extracting sha256:8013759f7522b8b1357b2de70bc0629a90b3714569a359a17f1ef1dc520c10ef
#6 extracting sha256:8013759f7522b8b1357b2de70bc0629a90b3714569a359a17f1ef1dc520c10ef 0.0s done
#6 DONE 1.4s

#10 [stage-2  2/13] RUN echo "fs.file-max = 65535" > /etc/sysctl.conf 	&& apt-get update 	&& apt-get install -y --no-install-recommends jq logrotate 	&& apt-get clean 	&& rm -rf /var/lib/apt/lists/*
#10 0.271 Get:1 http://deb.debian.org/debian bookworm InRelease [151 kB]
#10 0.283 Get:2 https://deb.nodesource.com/node_20.x nodistro InRelease [12.1 kB]
#10 0.292 Get:3 http://deb.debian.org/debian bookworm-updates InRelease [55.4 kB]
#10 0.300 Get:4 http://deb.debian.org/debian-security bookworm-security InRelease [48.0 kB]
#10 0.357 Get:5 https://deb.nodesource.com/node_20.x nodistro/main amd64 Packages [11.1 kB]
#10 0.422 Get:6 http://deb.debian.org/debian bookworm/main amd64 Packages [8792 kB]
#10 1.764 Reading package lists...
#10 2.074 E: Release file for http://deb.debian.org/debian/dists/bookworm-updates/InRelease is not valid yet (invalid for another 1h 37min 47s). Updates for this repository will not be applied.
#10 2.074 E: Release file for http://deb.debian.org/debian-security/dists/bookworm-security/InRelease is not valid yet (invalid for another 1h 42min 38s). Updates for this repository will not be applied.
#10 ERROR: process "/bin/bash -o pipefail -c echo \"fs.file-max = 65535\" > /etc/sysctl.conf \t&& apt-get update \t&& apt-get install -y --no-install-recommends jq logrotate \t&& apt-get clean \t&& rm -rf /var/lib/apt/lists/*" did not complete successfully: exit code: 100
------
 > [stage-2  2/13] RUN echo "fs.file-max = 65535" > /etc/sysctl.conf 	&& apt-get update 	&& apt-get install -y --no-install-recommends jq logrotate 	&& apt-get clean 	&& rm -rf /var/lib/apt/lists/*:
0.271 Get:1 http://deb.debian.org/debian bookworm InRelease [151 kB]
0.283 Get:2 https://deb.nodesource.com/node_20.x nodistro InRelease [12.1 kB]
0.292 Get:3 http://deb.debian.org/debian bookworm-updates InRelease [55.4 kB]
0.300 Get:4 http://deb.debian.org/debian-security bookworm-security InRelease [48.0 kB]
0.357 Get:5 https://deb.nodesource.com/node_20.x nodistro/main amd64 Packages [11.1 kB]
0.422 Get:6 http://deb.debian.org/debian bookworm/main amd64 Packages [8792 kB]

2.074 E: Release file for http://deb.debian.org/debian/dists/bookworm-updates/InRelease is not valid yet (invalid for another 1h 37min 47s). Updates for this repository will not be applied.
2.074 E: Release file for http://deb.debian.org/debian-security/dists/bookworm-security/InRelease is not valid yet (invalid for another 1h 42min 38s). Updates for this repository will not be applied.
------
Dockerfile:28
--------------------
  27 |     
  28 | >>> RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
  29 | >>> 	&& apt-get update \
  30 | >>> 	&& apt-get install -y --no-install-recommends jq logrotate \
  31 | >>> 	&& apt-get clean \
  32 | >>> 	&& rm -rf /var/lib/apt/lists/*
  33 |     
--------------------
ERROR: failed to solve: process "/bin/bash -o pipefail -c echo \"fs.file-max = 65535\" > /etc/sysctl.conf \t&& apt-get update \t&& apt-get install -y --no-install-recommends jq logrotate \t&& apt-get clean \t&& rm -rf /var/lib/apt/lists/*" did not complete successfully: exit code: 100

[adrum]

Seems like this was a timing issue with the CI during the apt update

[code-a-cola]

Having the same issue on my pull request.

[beatles1]

What's the difference between this and #4105 ? This functionality would be really useful for me and just wondering which would be better to help testing for?

[adrum]

@beatles1 the only difference between this one and the one you linked is this MR layers in a commit on top that resolves the merge conflicts with upstream. Merging this MR should also mark the other one merged.

[beatles1]

Awesome, hopefully the CI can be re-run and then I'll test the Docker image

[Iaotle]

@adrum I feel kinda bad for rushing you to re-make the PR, you put in effort fixing merge conflicts and submitting a PR just to end up in limbo </3

I admire the effort though!