Skip to content

Commit a7387c9

Browse files
wip
1 parent 153bcf6 commit a7387c9

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

magento/Dockerfile-2.4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ COPY scripts/allow-composer-plugins.php scripts/allow-composer-plugins.php
2020
COPY scripts/remove-paypal-braintree.php scripts/remove-paypal-braintree.php
2121
COPY scripts/patch-AC2855.php scripts/patch-AC2855.php
2222
COPY templates/memory-limit-php.ini /usr/local/etc/php/conf.d/memory-limit-php.ini
23+
COPY templates/supervisord-webserver.conf /etc/supervisor/conf.d/webserver.conf
2324

2425
RUN set -e; \
2526
./start-services && \

magento/entrypoint.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33
# Comes from the parent image
44
./start-services
55

6-
nohup /usr/local/bin/php -S 0.0.0.0:80 -t /data/pub/ /data/phpserver/router.php &
7-
status=$?
8-
if [ $status -ne 0 ]; then
9-
echo "Failed to start the php server: $status"
10-
exit $status
11-
fi
12-
136
if [ -n "$URL" ] && [ "$URL" != "http://localhost/" ]; then
147
echo "Updating Base URL"
158
magerun2 config:store:set web/unsecure/base_url $URL
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[program:webserver]
2+
command=/usr/local/bin/php -S 0.0.0.0:80 -t /data/pub/ /data/phpserver/router.php
3+
autorestart=true

0 commit comments

Comments
 (0)