Commit 445f59f
committed
fix: run the web image unprivileged
SonarCloud raised docker:S6471 on the new stage: nginx:alpine starts its
master process as root. The php-fpm stage next to it deliberately does
not, so this was an inconsistency introduced by the same commit that
added the stage, not a pre-existing trade-off worth accepting.
nginxinc/nginx-unprivileged runs as uid 101 throughout. A port below 1024
needs a capability it does not have, so the server block, EXPOSE, the
healthcheck, the compose port mapping and the README example move to
8080. The pid file already lived in /tmp, so nothing else had to change.
Verified on the built image: id reports uid=101(nginx), every nginx
process runs as nginx, and the two containers together still answer 200
with the real login form while nginx serves /favicon.ico as image/x-icon.
Signed-off-by: Sebastian Mendel <github@sebastianmendel.de>1 parent 76aa071 commit 445f59f
4 files changed
Lines changed: 15 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
190 | 190 | | |
191 | 191 | | |
192 | 192 | | |
193 | | - | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
194 | 198 | | |
195 | 199 | | |
196 | 200 | | |
| |||
217 | 221 | | |
218 | 222 | | |
219 | 223 | | |
220 | | - | |
| 224 | + | |
221 | 225 | | |
222 | 226 | | |
223 | | - | |
| 227 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
74 | 74 | | |
75 | 75 | | |
76 | 76 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
| 104 | + | |
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
11 | 13 | | |
12 | 14 | | |
13 | 15 | | |
| |||
0 commit comments