Skip to content

Commit 1658c2d

Browse files
marcjmarcj
committed
removed environment variables and pass arugments to the entrypoint directly
1 parent d1de1d2 commit 1658c2d

File tree

8 files changed

+56
-49
lines changed

8 files changed

+56
-49
lines changed

‎Makefile‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
VERSION?=dev-master
2+
HTTP_VERSION?=dev-master
23
TAG?=latest
34

45
# example:
56
# $ make VERSION=dev-master TAG=latest nginx
67

78
nginx:
8-
docker build -t phppm/nginx:${TAG} -f build/Dockerfile-nginx build/ --build-arg version=${VERSION}
9+
docker build -t phppm/nginx:${TAG} -f build/Dockerfile-nginx build/ --build-arg version=${VERSION} --build-arg http_version=${HTTP_VERSION}
10+
docker tag phppm/nginx:${TAG} phppm/nginx:latest
911

1012
ppm:
11-
docker build -t phppm/ppm:${TAG} -f build/Dockerfile-ppm build/ --build-arg version=${VERSION}
13+
docker build -t phppm/ppm:${TAG} -f build/Dockerfile-ppm build/ --build-arg version=${VERSION} --build-arg http_version=${HTTP_VERSION}
14+
docker tag phppm/ppm:${TAG} phppm/ppm:latest
1215

1316
standalone:
14-
docker build -t phppm/standalone:${TAG} -f build/Dockerfile-standalone build/ --build-arg version=${VERSION}
17+
docker build -t phppm/standalone:${TAG} -f build/Dockerfile-standalone build/ --build-arg version=${VERSION} --build-arg http_version=${HTTP_VERSION}
18+
docker tag phppm/standalone:${TAG} phppm/standalone:latest
1519

20+
push-all:
21+
docker push phppm/nginx:${TAG}
22+
docker push phppm/standalone:${TAG}
23+
docker push phppm/ppm:${TAG}

‎README.md‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,30 @@ You can use [PHP-PM](https://github.com/php-pm/php-pm) using Docker. We provide
1111
### Examples
1212

1313
```
14+
# change into your project folder first
15+
cd your/symfony-project/
16+
1417
# see what php-pm binary can do for you.
1518
$ docker run -v `pwd`:/var/www/ phppm/ppm --help
1619
$ docker run -v `pwd`:/var/www/ phppm/ppm config --help
1720
1821
# with nginx as static file server
19-
$ docker run --rm --name ppm -v `pwd`:/var/www -p 8080:80 phppm/nginx:latest
22+
$ docker run -v `pwd`:/var/www -p 8080:80 phppm/nginx
2023
2124
# with php-pm as static file server (dev only)
22-
$ docker run --rm --name ppm -v `pwd`:/var/www -p 8080:80 phppm/nginx:latest
25+
$ docker run -v `pwd`:/var/www -p 8080:80 phppm/standalone
2326
2427
# use `PPM_CONFIG` environment variable to choose a different ppm config file.
25-
$ docker run --rm --name ppm -e PPM_CONFIG=ppm-prod.json -v `pwd`:/var/www -p 80:80 phppm/nginx:latest
28+
$ docker run -v `pwd`:/var/www -p 80:80 phppm/nginx -c ppm-prod.json
2629
2730
# enable file tracking, to automatically restart ppm when php source changed
28-
$ docker run --rm --name ppm -e PPM_DEBUG=1 -e PPM_APP_ENV=dev -v `pwd`:/var/www -p 80:80 phppm/nginx:latest
31+
$ docker run -v `pwd`:/var/www -p 80:80 phppm/nginx --debug=1 --app-env=dev
2932
3033
# change static file directory. PPM_STATIC relative to mounted /var/www/.
31-
$ docker run --rm --name ppm -e PPM_STATIC=./web/ -v `pwd`:/var/www -p 80:80 phppm/nginx:latest
34+
$ docker run -v `pwd`:/var/www -p 80:80 phppm/nginx --static-directory=web/
3235
3336
# Use 16 threads/workers for PHP-PM.
34-
$ docker run --rm --name ppm -e PPM_WORKER=16 -v `pwd`:/var/www -p 80:80 phppm/nginx:latest
37+
$ docker run -v `pwd`:/var/www -p 80:80 phppm/nginx --workers=16
3538
```
3639

3740
Docker compose
@@ -41,37 +44,28 @@ version: "3.1"
4144
4245
services:
4346
ppm:
44-
image: phppm/nginx:latest
47+
image: phppm/nginx
48+
command: --debug=1 --app-env=dev --static-directory=web/
4549
volumes:
4650
- ./symfony-app/:/var/www
4751
ports:
4852
- "80:80"
49-
environment:
50-
PPM_DEBUG: 1
51-
PPM_APP_ENV: dev
52-
PPM_STATIC: ./web/
5353
```
5454

5555
### Configuration
5656

5757
You should configure PPM via the ppm.json in the root directory, which is withing the container mounted to
58-
`/var/www/`.
58+
`/var/www/`. Alternatively, you can overwrite each option using the regular cli arguments.
5959

6060
```
61-
docker run phppm/ppm config --help
62-
```
63-
64-
Additional you can use environment variables to change some configuration properties.
61+
# change the ppm.json within current directory
62+
docker run -v `pwd`:/var/www phppm/ppm config --help
6563
66-
| Name | Default | Description |
67-
| ------------- | ------------- | -------- |
68-
| PPM_CONFIG | ppm.json | Which configuration to use |
69-
| PPM_DEBUG | 0 | Use 1 to activate debugging (automatic reload of workers when source code changes) |
70-
| PPM_APP_ENV | prod | The application environment |
71-
| PPM_STATIC | | Use as root folder for nginx or standalone static file serving |
72-
| PPM_WORKER | 8 | How many workers should be used to server php application. |
73-
74-
Note, if you don't specify the environment variables above, the values from your ppm.json if present will be used.
64+
# not persisting config changes
65+
docker run -v `pwd`:/var/www -p 80:80 phppm/nginx --help
66+
docker run -v `pwd`:/var/www -p 80:80 phppm/nginx --workers=1 --debug 1
67+
docker run -v `pwd`:/var/www -p 80:80 phppm/nginx --c prod-ppm.json
68+
```
7569

7670
## Build image with own tools/dependencies
7771

‎build/Dockerfile-nginx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM composer/composer:1.1 as composer
22

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

67
FROM alpine:3.6
78

@@ -13,6 +14,8 @@ RUN apk --no-cache add tzdata && \
1314
echo "UTC" | tee /etc/timezone && \
1415
apk del tzdata
1516

17+
RUN apk --no-cache add bash
18+
1619
RUN apk --no-cache add \
1720
php7 php7-opcache php7-fpm php7-cgi php7-ctype php7-json php7-dom php7-zip php7-zip php7-gd \
1821
php7-curl php7-mbstring php7-redis php7-mcrypt php7-posix php7-pdo_mysql php7-tokenizer php7-simplexml php7-session \
@@ -31,4 +34,4 @@ COPY --from=composer /ppm /ppm
3134
WORKDIR /var/www
3235

3336
ADD run-nginx.sh /etc/app/run.sh
34-
ENTRYPOINT ["/bin/sh", "/etc/app/run.sh"]
37+
ENTRYPOINT ["/bin/bash", "/etc/app/run.sh"]

‎build/Dockerfile-ppm‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM composer/composer:1.1 as composer
22

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

67
FROM alpine:3.6
78

‎build/Dockerfile-standalone‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM composer/composer:1.1 as composer
22

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

67
FROM alpine:3.6
78

‎build/run-nginx.sh‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
1-
#!/bin/sh
1+
#!/bin/bash
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

55
STATIC=/var/www/
6-
[ ! -z "$PPM_STATIC" ] && STATIC="${STATIC}${PPM_STATIC}"
6+
args=" $@ "
7+
if [[ ! $args =~ " --help " ]]; then
8+
ARG_STATIC=`/ppm/vendor/bin/ppm config --show-option="static-directory" "$@"`
9+
fi
710

11+
[ ! -z "$ARG_STATIC" ] && STATIC="${STATIC}${ARG_STATIC}"
812
sed -i "s#STATIC_DIRECTORY#${STATIC}#g" /etc/nginx/sites-enabled/default
913

1014
nginx
1115

12-
ARGS='--port=8080 --static-directory=""'
13-
[ ! -z "$PPM_CONFIG" ] && ARGS="$ARGS -c $PPM_CONFIG"
14-
[ ! -z "$PPM_DEBUG" ] && ARGS="$ARGS --debug=$PPM_DEBUG"
15-
[ ! -z "$PPM_WORKER" ] && ARGS="$ARGS --worker=$PPM_WORKER"
16-
[ ! -z "$PPM_APP_ENV" ] && ARGS="$ARGS --app-env=$PPM_APP_ENV"
16+
mkdir -p /ppm/run
17+
chmod -R 777 /ppm/run
18+
ARGS='--port=8080 --socket-path=/ppm/run --pidfile=/ppm/ppm.pid'
1719

18-
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS
20+
# make sure static-directory is not served by php-pm
21+
ARGS="$ARGS --static-directory=''"
22+
23+
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@

‎build/run-ppm.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#!/bin/sh
1+
#!/bin/bash
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-
shift 2
65
trapIt /ppm/vendor/bin/ppm --ansi "$@"

‎build/run-standalone.sh‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1+
#/bin/bash
2+
13
trapIt () { "$@"& pid="$!"; trap "kill -INT $pid" INT TERM; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec;};
24

35
ARGS='--port 80'
4-
[ ! -z "$PPM_CONFIG" ] && ARGS="-c $PPM_CONFIG"
5-
[ ! -z "$PPM_DEBUG" ] && ARGS="$ARGS --debug $PPM_DEBUG"
6-
[ ! -z "$PPM_STATIC" ] && ARGS="$ARGS --static-directory $PPM_STATIC"
7-
[ ! -z "$PPM_WORKER" ] && ARGS="$ARGS --worker=$PPM_WORKER"
8-
[ ! -z "$PPM_APP_ENV" ] && ARGS="$ARGS --app-env=$PPM_APP_ENV"
9-
10-
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS
6+
trapIt /ppm/vendor/bin/ppm start --ansi $ARGS $@

0 commit comments

Comments
 (0)