8000 [cherry-pick] move mounted code to fix /tmp file permissions (#6356) · nginx/kubernetes-ingress@0a0c031 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0a0c031

Browse files
authored
[cherry-pick] move mounted code to fix /tmp file permissions (#6356)
move mounted code to fix /tmp file permissions
1 parent 97e7527 commit 0a0c031

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

build/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,9 @@ ARG IC_VERSION
573573
ARG TARGETPLATFORM
574574
ARG NAP_MODULES=none
575575

576-
RUN --mount=type=bind,target=/tmp \
576+
ENV BUILD_OS=${BUILD_OS}
577+
578+
RUN --mount=type=bind,target=/code \
577579
--mount=type=bind,from=nginx-files,src=common.sh,target=/usr/local/bin/common.sh \
578580
--mount=type=bind,from=nginx-files,src=patch-os.sh,target=/usr/local/bin/patch-os.sh \
579581
patch-os.sh \

build/scripts/common.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ set -e
55
PLUS=""
66
if [ -z "${BUILD_OS##*plus*}" ]; then
77
mkdir -p /etc/nginx/oidc/
8-
cp -a /tmp/internal/configs/oidc/* /etc/nginx/oidc/
8+
cp -a /code/internal/configs/oidc/* /etc/nginx/oidc/
99
mkdir -p /etc/nginx/state_files/
1010
PLUS=-plus
1111
fi
1212

13-
mkdir -p /etc/nginx/njs/ && cp -a /tmp/internal/configs/njs/* /etc/nginx/njs/
13+
mkdir -p /etc/nginx/njs/ && cp -a /code/internal/configs/njs/* /etc/nginx/njs/
1414
mkdir -p /var/lib/nginx /etc/nginx/secrets /etc/nginx/stream-conf.d
1515
setcap 'cap_net_bind_service=+eip' /usr/sbin/nginx 'cap_net_bind_service=+eip' /usr/sbin/nginx-debug
1616
setcap -v 'cap_net_bind_service=+eip' /usr/sbin/nginx 'cap_net_bind_service=+eip' /usr/sbin/nginx-debug
1717

18-
cp -a /tmp/internal/configs/version1/nginx$PLUS.ingress.tmpl \
19-
/tmp/internal/configs/version1/nginx$PLUS.tmpl \
20-
/tmp/internal/configs/version2/nginx$PLUS.virtualserver.tmpl \
21-
/tmp/internal/configs/version2/nginx$PLUS.transportserver.tmpl \
18+
cp -a /code/internal/configs/version1/nginx$PLUS.ingress.tmpl \
19+
/code/internal/configs/version1/nginx$PLUS.tmpl \
20+
/code/internal/configs/version2/nginx$PLUS.virtualserver.tmpl \
21+
/code/internal/configs/version2/nginx$PLUS.transportserver.tmpl \
2222
/
2323

2424
chown -R 101:0 /etc/nginx /var/cache/nginx /var/lib/nginx /var/log/nginx /*.tmpl

0 commit comments

Comments
 (0)
0