File tree Expand file tree Collapse file tree 7 files changed +11
-9
lines changed Expand file tree Collapse file tree 7 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ FROM composer/composer:1.1 as composer
22
33ARG version=dev-master
44ARG http_version=dev-master
5+
56RUN mkdir /ppm && cd /ppm && composer require php-pm/php-pm:${version} && composer require php-pm/httpkernel-adapter:${http_version}
67
78FROM alpine:3.7
@@ -27,7 +28,7 @@ RUN apk --no-cache add nginx
2728ADD etc/nginx_default.conf /etc/nginx/sites-enabled/default
2829ADD etc/nginx.conf /etc/nginx/nginx.conf
2930
30- EXPOSE 80
31+ EXPOSE 8080
3132
3233COPY --from=composer /ppm /ppm
3334
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ ADD etc/php.ini /etc/php7/php.ini
2323
2424RUN apk --no-cache add bash
2525
26- EXPOSE 80
26+ EXPOSE 8080
2727
2828COPY --from=composer /ppm /ppm
2929
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ ADD etc/php.ini /etc/php7/php.ini
2323
2424RUN apk --no-cache add bash
2525
26- EXPOSE 80
26+ EXPOSE 8080
2727
2828COPY --from=composer /ppm /ppm
2929
Original file line number Diff line number Diff line change 11server {
2- listen 80 ;
2+ listen 8080 ;
33 server_name _;
44 root STATIC_DIRECTORY;
55
@@ -14,6 +14,6 @@ server {
1414 proxy_set_header X-Real-IP $remote_addr;
1515 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
1616 proxy_set_header X-Forwarded-Proto $scheme;
17- proxy_pass http://127.0.0.1:8080 ;
17+ proxy_pass http://127.0.0.1:8081 ;
1818 }
1919}
Original file line number Diff line number Diff line change 1515
1616mkdir -p /ppm/run
1717chmod -R 777 /ppm/run
18- ARGS=' --port=8080 --socket-path=/ppm/run --pidfile=/ppm/ppm.pid'
18+ ARGS=' --port=8081 --socket-path=/ppm/run --pidfile=/ppm/ppm.pid'
1919
2020# make sure static-directory is not served by php-pm
2121ARGS=" $ARGS --static-directory=''"
2222
23- trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@
23+ trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@
Original file line number Diff line number Diff line change 22
33trapIt () { " $@ " & pid=" $! " ; trap " kill -INT $pid " INT TERM; while kill -0 $pid > /dev/null 2>&1 ; do wait $pid ; ec=" $? " ; done ; exit $ec ; };
44
5- trapIt /ppm/vendor/bin/ppm --ansi " $@ "
5+ ARGS=' --port 8080'
6+ trapIt /ppm/vendor/bin/ppm start --ansi $@
Original file line number Diff line number Diff line change 22
33trapIt () { " $@ " & pid=" $! " ; trap " kill -INT $pid " INT TERM; while kill -0 $pid > /dev/null 2>&1 ; do wait $pid ; ec=" $? " ; done ; exit $ec ; };
44
5- ARGS=' --port 80 '
5+ ARGS=' --port 8080 '
66trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@
You can’t perform that action at this time.
0 commit comments