@@ -10,8 +10,22 @@ RUN addgroup --gid 1000 wp \
1010 && usermod -a -G wp www-data
1111
1212# All new files should be group-writable
13+ # TODO: This is likely wrong. Harmless, but wrong.
1314RUN echo 'umask 002' >> /etc/profile.d/set-umask.sh
1415
16+ # # Set global umask in /etc/bashrc
17+ # RUN echo && echo 'umask 002' >> /etc/bash.bashrc
18+
19+ # # Set umask for Apache & PHP
20+ # RUN echo >> /etc/apache2/envvars \
21+ # && echo '# Set umask so newly created files are group writeable' >> /etc/apache2/envvars \
22+ # && echo 'umask 002' >> /etc/apache2/envvars
23+
24+ # Set global Umask with pam_umask
25+ RUN echo >> /etc/pam.d/common-session \
26+ && echo '# Set umask so newly created files are group writeable' >> /etc/pam.d/common-session \
27+ && echo 'session optional pam_umask.so umask=002' >> /etc/pam.d/common-session
28+
1529# Set Apache ServerName globally to address slowdowns
1630RUN echo "ServerName localhost" > /etc/apache2/conf-available/server-name.conf \
1731 && a2enconf server-name
@@ -98,6 +112,15 @@ RUN apt-get update -yqq \
98112 jq \
99113 && rm -rf /var/lib/apt/lists/*
100114
115+
116+ # Install acl, attempting to fix umask permissions issues
117+ # NOTE: unsupported on this filesystem??
118+ # RUN apt-get update -yqq \
119+ # && apt-get install -y --no-install-recommends \
120+ # acl \
121+ # && rm -rf /var/lib/apt/lists/*
122+
123+
101124# Setup location for wp user's SSH keys
102125RUN mkdir -p /ssh_keys \
103126 && chmod 0700 /ssh_keys \
0 commit comments