Skip to content

Commit 396c42e

Browse files
committed
sudo for www-data
1 parent 3327533 commit 396c42e

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ ENV SESSION_HANDLER_PATH=""
1313

1414
RUN apt-get update && apt-get install -y wget vim supervisor zip libfreetype6-dev libjpeg62-turbo-dev \
1515
libmcrypt-dev libpng-dev libssl-dev libaio1 git libcurl4-openssl-dev libxslt-dev \
16-
libldap2-dev libicu-dev libc-client-dev libkrb5-dev libsqlite3-dev libedit-dev
16+
libldap2-dev libicu-dev libc-client-dev libkrb5-dev libsqlite3-dev libedit-dev \
17+
sudo
1718

1819
RUN a2enmod rewrite
1920

@@ -39,12 +40,17 @@ RUN echo "---> Adding Support for NewRelic" && \
3940
cp ./agent/x64/newrelic-20151012.so /usr/local/lib/php/extensions/no-debug-non-zts-20151012/newrelic.so && \
4041
cp ./daemon/newrelic-daemon.x64 /usr/bin/newrelic-daemon && \
4142
cp ./scripts/newrelic.ini.template /scripts/newrelic.ini && \
42-
mkdir /var/log/newrelic
43+
mkdir /var/log/newrelic && \
44+
chown -R www-data:www-data /var/log/newrelic && \
45+
rm -rf /tmp/*
4346

4447
RUN echo "---> Adding Tini" && \
4548
wget -O /tini https://github.com/krallin/tini/releases/download/v0.18.0/tini-static && \
4649
chmod +x /tini
4750

51+
RUN echo "---> Config sudoers" && \
52+
echo "www-data ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers
53+
4854
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
4955

5056
RUN pecl install xdebug
@@ -60,6 +66,4 @@ WORKDIR "/var/www/html"
6066

6167
EXPOSE 8080 9001
6268

63-
ENTRYPOINT ["/tini", "--"]
64-
65-
CMD ["/usr/bin/apache-run"]
69+
CMD ["/tini", "--", "/usr/bin/apache-run"]

apache-run.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#!/bin/bash
22

33
if [[ $XDEBUG_ENABLED == true ]]; then
4-
echo "zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini
5-
echo "xdebug.var_display_max_depth=5" >> /usr/local/etc/php/conf.d/xdebug.ini
4+
echo "zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
5+
echo "xdebug.var_display_max_depth=5" | sudo tee -a /usr/local/etc/php/conf.d/xdebug.ini
66
fi
77

88
if [[ $NR_ENABLED == true ]]; then
9-
sed -i -e "s/"REPLACE_WITH_REAL_KEY"/$NR_LICENSE_KEY/g" /scripts/newrelic.ini
10-
sed -i -e "s/PHP Application/$NR_APP_NAME/g" /scripts/newrelic.ini
11-
cp /scripts/newrelic.ini /usr/local/etc/php/conf.d/newrelic.ini
9+
sudo sed -i -e "s/"REPLACE_WITH_REAL_KEY"/$NR_LICENSE_KEY/g" /scripts/newrelic.ini
10+
sudo sed -i -e "s/PHP Application/$NR_APP_NAME/g" /scripts/newrelic.ini
11+
sudo cp /scripts/newrelic.ini /usr/local/etc/php/conf.d/newrelic.ini
1212
fi
1313

1414
if [[ $SESSION_HANDLER == true ]]; then
15-
echo "session.save_handler = $SESSION_HANDLER_NAME" > /usr/local/etc/php/conf.d/session-handler.ini
16-
echo "session.save_path = $SESSION_HANDLER_PATH" >> /usr/local/etc/php/conf.d/session-handler.ini
15+
echo "session.save_handler = $SESSION_HANDLER_NAME" | sudo tee -a /usr/local/etc/php/conf.d/session-handler.ini
16+
echo "session.save_path = $SESSION_HANDLER_PATH" | sudo tee -a /usr/local/etc/php/conf.d/session-handler.ini
1717
fi
1818

1919
apache2-foreground

0 commit comments

Comments
 (0)