Skip to content

Commit 5e12ce4

Browse files
committed
Run on port 8080 instead of port 80 for GAE compatibility
1 parent fa9b3d1 commit 5e12ce4

7 files changed

+11
-9
lines changed

build/Dockerfile-nginx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ FROM composer/composer:1.1 as composer
22

33
ARG version=dev-master
44
ARG http_version=dev-master
5+
56
RUN mkdir /ppm && cd /ppm && composer require php-pm/php-pm:${version} && composer require php-pm/httpkernel-adapter:${http_version}
67

78
FROM alpine:3.7
@@ -27,7 +28,7 @@ RUN apk --no-cache add nginx
2728
ADD etc/nginx_default.conf /etc/nginx/sites-enabled/default
2829
ADD etc/nginx.conf /etc/nginx/nginx.conf
2930

30-
EXPOSE 80
31+
EXPOSE 8080
3132

3233
COPY --from=composer /ppm /ppm
3334

build/Dockerfile-ppm

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ADD etc/php.ini /etc/php7/php.ini
2323

2424
RUN apk --no-cache add bash
2525

26-
EXPOSE 80
26+
EXPOSE 8080
2727

2828
COPY --from=composer /ppm /ppm
2929

build/Dockerfile-standalone

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ADD etc/php.ini /etc/php7/php.ini
2323

2424
RUN apk --no-cache add bash
2525

26-
EXPOSE 80
26+
EXPOSE 8080
2727

2828
COPY --from=composer /ppm /ppm
2929

build/etc/nginx_default.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
server {
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
}

build/run-nginx.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ nginx
1515

1616
mkdir -p /ppm/run
1717
chmod -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
2121
ARGS="$ARGS --static-directory=''"
2222

23-
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@
23+
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@

build/run-ppm.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
trapIt () { "$@"& 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 $@

build/run-standalone.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
trapIt () { "$@"& 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'
66
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@

0 commit comments

Comments
 (0)