Skip to content

Commit 4eb1cb9

Browse files
committed
Merged open PRs: php-pm#11, php-pm#14, php-pm#20;
Updated composer and alpine image versions to latest;
1 parent 8b16627 commit 4eb1cb9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build/Dockerfile-nginx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM composer:1.8 as composer
1+
FROM composer:1.9 as composer
22

33
ARG version=dev-master
44
ARG http_version=dev-master
55

66
RUN mkdir /ppm && cd /ppm && composer require php-pm/php-pm:${version} && composer require php-pm/httpkernel-adapter:${http_version}
77

8-
FROM alpine:3.9
8+
FROM alpine:3.10
99

1010
ENV LC_ALL en_US.UTF-8
1111
ENV LANG en_US.UTF-8

build/Dockerfile-ppm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM composer:1.8 as composer
1+
FROM composer:1.9 as composer
22

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

7-
FROM alpine:3.9
7+
FROM alpine:3.10
88

99
ENV LC_ALL en_US.UTF-8
1010
ENV LANG en_US.UTF-8

build/Dockerfile-standalone

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM composer:1.8 as composer
1+
FROM composer:1.9 as composer
22

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

7-
FROM alpine:3.9
7+
FROM alpine:3.10
88

99
ENV LC_ALL en_US.UTF-8
1010
ENV LANG en_US.UTF-8

0 commit comments

Comments
 (0)