File tree Expand file tree Collapse file tree 2 files changed +7
-15
lines changed Expand file tree Collapse file tree 2 files changed +7
-15
lines changed Original file line number Diff line number Diff line change @@ -41,11 +41,8 @@ RUN echo "---> Adding Support for NewRelic" && \
41
41
cp ./scripts/newrelic.ini.template /scripts/newrelic.ini && \
42
42
mkdir /var/log/newrelic
43
43
44
- RUN echo "---> Adding the runner user" && \
45
- adduser --disabled-password -u 1000 runner && \
46
- mkdir -p /var/www/html && \
47
- chown -R runner:runner /var/www/html && \
48
- wget -O /tini https://github.com/krallin/tini/releases/download/v0.16.1/tini-static && \
44
+ RUN echo "---> Adding Tini" && \
45
+ wget -O /tini https://github.com/krallin/tini/releases/download/v0.18.0/tini-static && \
49
46
chmod +x /tini
50
47
51
48
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer
@@ -57,10 +54,12 @@ COPY apache-run.sh /usr/bin/apache-run
57
54
58
55
RUN chmod a+x /usr/bin/apache-run
59
56
60
- USER runner
57
+ USER www-data
61
58
62
59
WORKDIR "/var/www/html"
63
60
64
61
EXPOSE 8080 9001
65
62
66
- ENTRYPOINT ["/tini" , "--" , "/usr/bin/apache-run" ]
63
+ ENTRYPOINT ["/tini" , "--" ]
64
+
65
+ CMD ["/usr/bin/apache-run" ]
Original file line number Diff line number Diff line change @@ -16,11 +16,4 @@ if [[ $SESSION_HANDLER == true ]]; then
16
16
echo " session.save_path = $SESSION_HANDLER_PATH " >> /usr/local/etc/php/conf.d/session-handler.ini
17
17
fi
18
18
19
- composer install && rm -rf var/cache/* var/logs/* \
20
- && mkdir -p /var/www/html/var/cache \
21
- && mkdir -p /var/www/html/var/logs \
22
- && mkdir -p /var/www/html/var/sessions \
23
- && chown -R www-data:www-data /var/www/html/var/cache && chmod 777 /var/www/html/var/cache \
24
- && chown -R www-data:www-data /var/www/html/var/logs && chmod 777 /var/www/html/var/logs \
25
- && chown -R www-data:www-data /var/www/html/var/sessions && chmod 777 /var/www/html/var/sessions \
26
- && apache2-foreground
19
+ apache2-foreground
You can’t perform that action at this time.
0 commit comments