Skip to content

Commit b34ad1d

Browse files
authored
Merge pull request #20 from devilbox/release-0.13
New container: PHP 5.3
2 parents 3361ca6 + bdcbee3 commit b34ad1d

21 files changed

+1145
-34
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env:
2323
# DOCKER_PASSWORD
2424
- secure: "ZRrVOVOkSCS2UxEi1HNF1iKefK4sDT/sPRl1HxMQjLnRRaAMdG0aRnBwQf2YAM2qzhCfN85qt6zZtC4awc2mHiZ88JrAZxBjK6xj4BwOyLbDuzpBsKXnx8Nix+wyYYKSjsC3LOYrsUe+4rvkw3tVvVaX8G2llojwdksF34VDmmHBmzCG/Bsexk7UqC+qw0PZm7BtctQO+IL0btmMDijRDElxfR+AuPvf9JdkhYzw9TOO7Jqd53NssNVGyL+XSV0dfGn8PkZTp1e8D+28pLK4oGVog+Wk7Cq94hSGjk5AkWKvL5441rupG1AA8K3njeDNMKdov4o+dmnkAH7Jh8tjShMhNhoxHce3IzpczjhoE1EyYQcyPf1qdfhV35Xv096iWX5809pp1MZF2oE5eism8JaU9NpGClryVbKVKtup8ko9/tCqz01Czq5Vue40feMkGtdePulg59OhyyPLYldsObw8QlZydkrmgVZe6b+GyybeiHraTfDq4pvTgUrC4Cmm5J3IB5Ig1THEiYKHfRJ5hSSMDDODeBXc8Xh6mFssEVshNx/jbUQWuAVYQFw/GIquVHxr6btbevrWIoD+zmqcc0L98u9pYH8w7b+gMgVJNCC4QQz2NCGGWw9l9/TmLrKJgeXbG18n8D314le1zuna6/VfH9pXIlbNO4hgz5NLHJk="
2525
matrix:
26+
- PHP=5.3
2627
- PHP=5.4
2728
- PHP=5.5
2829
- PHP=5.6

Dockerfiles/base/Dockerfile-5.3

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
2+
FROM devilbox/php-fpm-5.3
3+
MAINTAINER "cytopia" <[email protected]>
4+
5+
6+
###
7+
### Labels
8+
###
9+
LABEL \
10+
name="cytopia's PHP-FPM 5.3 Image" \
11+
image="devilbox/php-fpm" \
12+
tag="5.3-base" \
13+
vendor="devilbox" \
14+
license="MIT"
15+
16+
17+
###
18+
### Envs
19+
###
20+
ENV MY_USER="devilbox" \
21+
MY_GROUP="devilbox" \
22+
MY_UID="1000" \
23+
MY_GID="1000"
24+
25+
26+
###
27+
### User/Group
28+
###
29+
RUN set -x \
30+
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
31+
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
32+
33+
34+
###
35+
### Upgrade (install ps)
36+
###
37+
RUN set -x \
38+
&& apt-get update \
39+
&& apt-get upgrade -y \
40+
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
41+
&& rm -rf /var/lib/apt/lists/*
42+
43+
44+
###
45+
### Configure
46+
###
47+
RUN set -x \
48+
&& rm -rf /usr/local/etc/php-fpm.d \
49+
&& mkdir -p /usr/local/etc/php-fpm.d \
50+
&& mkdir -p /var/lib/php/session \
51+
&& mkdir -p /var/lib/php/wsdlcache \
52+
&& chown -R devilbox:devilbox /var/lib/php/session \
53+
&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
54+
55+
56+
###
57+
### Copy files
58+
###
59+
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
60+
COPY ./data/docker-entrypoint.d /docker-entrypoint.d
61+
COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
62+
COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
63+
COPY ./data/php-fpm.d-docker-5.3.conf /usr/local/etc/php-fpm.d/docker.conf
64+
65+
66+
###
67+
### Verify
68+
###
69+
RUN set -x \
70+
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \
71+
&& /usr/local/sbin/php-fpm --test \
72+
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
73+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
74+
75+
76+
###
77+
### Ports
78+
###
79+
EXPOSE 9000
80+
81+
82+
###
83+
### Entrypoint
84+
###
85+
ENTRYPOINT ["/docker-entrypoint.sh"]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[www]
2+
; Keep env variables set by docker
3+
;clear_env = no
4+
5+
; Redirect worker stdout and stderr into main error log. If not set, stdout and
6+
; stderr will be redirected to /dev/null according to FastCGI specs.
7+
; Note: on highloaded environement, this can cause some delay in the page
8+
; process time (several ms).
9+
; Default Value: no
10+
catch_workers_output = yes

0 commit comments

Comments
 (0)