Skip to content

Commit

Permalink
move mounted code to fix /tmp file permissions (#6354)
Browse files Browse the repository at this point in the history
  • Loading branch information
pdabelf5 authored Sep 4, 2024
1 parent d0e56e9 commit 90a52a0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ ARG NAP_MODULES=none

ENV BUILD_OS=${BUILD_OS}

RUN --mount=type=bind,target=/tmp \
RUN --mount=type=bind,target=/code \
--mount=type=bind,from=nginx-files,src=common.sh,target=/usr/local/bin/common.sh \
--mount=type=bind,from=nginx-files,src=patch-os.sh,target=/usr/local/bin/patch-os.sh \
patch-os.sh \
Expand Down
12 changes: 6 additions & 6 deletions build/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ set -e
PLUS=""
if [ -z "${BUILD_OS##*plus*}" ]; then
mkdir -p /etc/nginx/oidc/
cp -a /tmp/internal/configs/oidc/* /etc/nginx/oidc/
cp -a /code/internal/configs/oidc/* /etc/nginx/oidc/
mkdir -p /etc/nginx/state_files/
PLUS=-plus
fi

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

cp -a /tmp/internal/configs/version1/nginx$PLUS.ingress.tmpl \
/tmp/internal/configs/version1/nginx$PLUS.tmpl \
/tmp/internal/configs/version2/nginx$PLUS.virtualserver.tmpl \
/tmp/internal/configs/version2/nginx$PLUS.transportserver.tmpl \
cp -a /code/internal/configs/version1/nginx$PLUS.ingress.tmpl \
/code/internal/configs/version1/nginx$PLUS.tmpl \
/code/internal/configs/version2/nginx$PLUS.virtualserver.tmpl \
/code/internal/configs/version2/nginx$PLUS.transportserver.tmpl \
/

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

0 comments on commit 90a52a0

Please sign in to comment.