Skip to content

Commit 47a2655

Browse files
Crazybusnik9000
authored andcommitted
Only mount and clean the /run/nginx directory (#884)
On Sles-12 and potentially other distros some extra stuff is automatically mounted into `/run` making it impossible to remove them and ultimately causing the build to fail. ``` / # mount | grep /run tmpfs on /run/secrets/credentials.d type tmpfs (ro,relatime) tmpfs on /run/secrets/SUSEConnect type tmpfs (ro,relatime) ``` However it looks like only `/run/nginx` is actually being used so there doesn't seen to be a need to mount and wipe the whole of `/run`
1 parent 5c793ca commit 47a2655

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ RUN install_packages \
6464

6565
# We mount these directories with tmpfs so we can write to them so they
6666
# have to be empty. So we delete them.
67-
RUN rm -rf /var/log/nginx && rm -rf /run
67+
RUN rm -rf /var/log/nginx && rm -rf /run/nginx
6868

6969
# Wheel inventory:
7070
# * Used to test the docs build

build_docs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def run_build_docs(args):
133133
raise ArgError('--all requires an agent to be running and ' +
134134
'SSH_AUTH_SOCK to be set')
135135
if not platform.startswith('linux'):
136-
docker_args.extend(['--tmpfs', '/run'])
136+
docker_args.extend(['--tmpfs', '/run/nginx'])
137137
docker_args.extend(['--tmpfs', '/root'])
138138
docker_args.extend(['--publish', '8022:22/tcp'])
139139
docker_args.extend(

0 commit comments

Comments
 (0)