7c10c413 by Adam Heath

Move location of php-fpm entrypoint from /root to /sbin.

1 parent 080295db
...@@ -8,5 +8,5 @@ RUN /tmp/files/configure ...@@ -8,5 +8,5 @@ RUN /tmp/files/configure
8 ADD https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar /usr/local/bin/wp 8 ADD https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar /usr/local/bin/wp
9 RUN ["chmod", "755", "/usr/local/bin/wp"] 9 RUN ["chmod", "755", "/usr/local/bin/wp"]
10 10
11 ENTRYPOINT ["/root/entrypoint"] 11 ENTRYPOINT ["/sbin/entrypoint"]
12 CMD ["/usr/sbin/php-fpm7.0", "--nodaemonize", "--force-stderr", "--fpm-config", "/etc/php/7.0/fpm/php-fpm.conf"] 12 CMD ["/usr/sbin/php-fpm7.0", "--nodaemonize", "--force-stderr", "--fpm-config", "/etc/php/7.0/fpm/php-fpm.conf"]
......
...@@ -7,7 +7,7 @@ apt-get install -y sudo ssmtp php7.0-fpm php7.0-mysql php7.0-imagick php7.0-ldap ...@@ -7,7 +7,7 @@ apt-get install -y sudo ssmtp php7.0-fpm php7.0-mysql php7.0-imagick php7.0-ldap
7 rm /etc/php/7.0/fpm/pool.d/www.conf 7 rm /etc/php/7.0/fpm/pool.d/www.conf
8 cp -a /tmp/files/app-defaults.conf /etc/php/7.0/fpm 8 cp -a /tmp/files/app-defaults.conf /etc/php/7.0/fpm
9 9
10 cp /tmp/files/entrypoint /root/entrypoint 10 cp /tmp/files/entrypoint /sbin/entrypoint
11 11
12 addgroup hostgroup 12 addgroup hostgroup
13 adduser --gecos 'Host User' --ingroup hostgroup --disabled-password hostuser 13 adduser --gecos 'Host User' --ingroup hostgroup --disabled-password hostuser
......