[PR #2904] [MERGED] Fixes for s6 timeout at startup #3634

New issue

Closed

opened 2026-02-26 08:31:23 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 08:31:23 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/2904
Author: @jc21
Created: 5/10/2023
Status: ✅ Merged
Merged: 5/10/2023
Merged by: @jc21

Base: develop ← Head: s6-verbose

📝 Commits (8)

db4ab1d Verbose debugging of s6 scripts
a1245bc Split up ownership to indentify point of failure
c432c34 Small refactor of user/groups and add checks during startup. Only use -x in bash scripts when DEBUG=true set in env vars
c3735fd Missed a file that was explicit verbose
4f41fe0 Update s6-overlay
ecf0290 Update s6-overlay
c3f019c Test ipv6 disabled in ci
4b6f9d9 Remove s6 service timeout

📊 Changes

15 files changed (+99 additions, -50 deletions)

View changed files

📝 docker/Dockerfile (+5 -1)
📝 docker/dev/Dockerfile (+7 -3)
📝 docker/docker-compose.ci.yml (+1 -0)
📝 docker/rootfs/bin/common.sh (+12 -0)
📝 docker/rootfs/etc/nginx/nginx.conf (+1 -1)
📝 docker/rootfs/etc/s6-overlay/s6-rc.d/backend/run (+3 -3)
📝 docker/rootfs/etc/s6-overlay/s6-rc.d/frontend/run (+3 -3)
📝 docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/run (+1 -1)
📝 docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/00-all.sh (+5 -1)
➖ docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh (+0 -20)
➕ docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-usergroup.sh (+40 -0)
📝 docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh (+12 -12)
📝 docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh (+5 -2)
📝 docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/90-banner.sh (+3 -2)
📝 docker/scripts/install-s6 (+1 -1)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/NginxProxyManager/nginx-proxy-manager/pull/2904 **Author:** [@jc21](https://github.com/jc21) **Created:** 5/10/2023 **Status:** ✅ Merged **Merged:** 5/10/2023 **Merged by:** [@jc21](https://github.com/jc21) **Base:** `develop` ← **Head:** `s6-verbose` --- ### 📝 Commits (8) - [`db4ab1d`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/db4ab1d548ab2d0b0bbe620034a9a48563ebd642) Verbose debugging of s6 scripts - [`a1245bc`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/a1245bc16149fd487e21014b26fd2e28b88cc768) Split up ownership to indentify point of failure - [`c432c34`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/c432c34fb3117da32c04acd1ca7826e9d63e6c85) Small refactor of user/groups and add checks during startup. Only use -x in bash scripts when DEBUG=true set in env vars - [`c3735fd`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/c3735fdbbb0e9ccc8f8a64c3a1ed76efb5472157) Missed a file that was explicit verbose - [`4f41fe0`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/4f41fe0c953176dd0ce00b222389e85d5ca4d6c9) Update s6-overlay - [`ecf0290`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/ecf02902032e4bde9bd67b4db7327ec93ca0c152) Update s6-overlay - [`c3f019c`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/c3f019c911f21a4fd446b377c7a7f4c45d092a60) Test ipv6 disabled in ci - [`4b6f9d9`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/4b6f9d9419b004a1f5734eea4b96231870623fa8) Remove s6 service timeout ### 📊 Changes **15 files changed** (+99 additions, -50 deletions) <details> <summary>View changed files</summary> 📝 `docker/Dockerfile` (+5 -1) 📝 `docker/dev/Dockerfile` (+7 -3) 📝 `docker/docker-compose.ci.yml` (+1 -0) 📝 `docker/rootfs/bin/common.sh` (+12 -0) 📝 `docker/rootfs/etc/nginx/nginx.conf` (+1 -1) 📝 `docker/rootfs/etc/s6-overlay/s6-rc.d/backend/run` (+3 -3) 📝 `docker/rootfs/etc/s6-overlay/s6-rc.d/frontend/run` (+3 -3) 📝 `docker/rootfs/etc/s6-overlay/s6-rc.d/nginx/run` (+1 -1) 📝 `docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/00-all.sh` (+5 -1) ➖ `docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-npmuser.sh` (+0 -20) ➕ `docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/10-usergroup.sh` (+40 -0) 📝 `docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh` (+12 -12) 📝 `docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh` (+5 -2) 📝 `docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/90-banner.sh` (+3 -2) 📝 `docker/scripts/install-s6` (+1 -1) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-26 08:31:23 +03:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/nginx-proxy-manager-NginxProxyManager#3634

No description provided.

Rows
Columns