Skip to content

Commit ffc03bf

Browse files
committed
Created a separate image for PHP 5.6 and added a Makefile
1 parent bba5d2f commit ffc03bf

File tree

14 files changed

+80
-16
lines changed

14 files changed

+80
-16
lines changed

Dockerfile-5.6

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM alpine:3.5
2+
3+
4+
5+
RUN apk -U upgrade && apk add \
6+
curl \
7+
nginx \
8+
php5 \
9+
php5-fpm \
10+
&& rm -rf /var/cache/apk/*
11+
12+
COPY files/s6-overlay files/general files/php5 /
13+
14+
WORKDIR /www
15+
16+
ENTRYPOINT ["/init"]
17+
18+
HEALTHCHECK --interval=5s --timeout=5s CMD curl -f http://127.0.0.1 || exit 1

Dockerfile-7.0

+2-7
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@ RUN apk -U upgrade && apk add \
77
nginx \
88
php7 \
99
php7-fpm \
10-
&& rm -rf /var/cache/apk/* \
11-
&& rm -rf /etc/nginx/conf.d \
12-
&& rm -rf /etc/php7/php-fpm.d
10+
&& rm -rf /var/cache/apk/*
1311

14-
ADD https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-amd64.tar.gz /tmp/
15-
RUN gunzip -c /tmp/s6-overlay-amd64.tar.gz | tar -xf - -C /
16-
17-
COPY files /
12+
COPY files/s6-overlay files/general files/php7 /
1813

1914
WORKDIR /www
2015

Dockerfile-7.1

+2-7
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@ RUN apk -U upgrade && apk add \
77
nginx \
88
php7 \
99
php7-fpm \
10-
&& rm -rf /var/cache/apk/* \
11-
&& rm -rf /etc/nginx/conf.d \
12-
&& rm -rf /etc/php7/php-fpm.d
10+
&& rm -rf /var/cache/apk/*
1311

14-
ADD https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-amd64.tar.gz /tmp/
15-
RUN gunzip -c /tmp/s6-overlay-amd64.tar.gz | tar -xf - -C /
16-
17-
COPY files /
12+
COPY files/s6-overlay files/general files/php7 /
1813

1914
WORKDIR /www
2015

Makefile

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
.PHONY: build up clean
2+
3+
build:
4+
mkdir files/s6-overlay
5+
wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download/v1.19.1.1/s6-overlay-amd64.tar.gz
6+
gunzip -c /tmp/s6-overlay-amd64.tar.gz | tar -xf - -C files/s6-overlay
7+
docker build -t existenz/webstack:5.6 -f Dockerfile-5.6 .
8+
docker build -t existenz/webstack:7.0 -f Dockerfile-7.0 .
9+
docker build -t existenz/webstack:7.1 -f Dockerfile-7.1 .
10+
11+
run:
12+
docker run -d -p 8056:80 --name existenz_webstack_56 existenz/webstack:5.6
13+
docker run -d -p 8070:80 --name existenz_webstack_70 existenz/webstack:7.0
14+
docker run -d -p 8071:80 --name existenz_webstack_71 existenz/webstack:7.1
15+
16+
stop:
17+
docker stop -t0 existenz_webstack_56
18+
docker stop -t0 existenz_webstack_70
19+
docker stop -t0 existenz_webstack_71
20+
docker rm existenz_webstack_56
21+
docker rm existenz_webstack_70
22+
docker rm existenz_webstack_71
23+
24+
clean:
25+
rm -rf files/s6-overlay
26+
docker rmi existenz/webstack:5.6
27+
docker rmi existenz/webstack:7.0
28+
docker rmi existenz/webstack:7.1
29+
30+
test:
31+
docker ps | grep webstack_56 | grep -q healthy
32+
docker ps | grep webstack_70 | grep -q healthy
33+
docker ps | grep webstack_71 | grep -q healthy
File renamed without changes.
File renamed without changes.

files/etc/php7/php-fpm.conf renamed to files/php5/etc/php5/php-fpm.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ log_level = notice
55
daemonize = no
66

77
[www]
8-
user = nginx
9-
group = nginx
8+
user = root
9+
group = root
1010
listen = 127.0.0.1:9000
1111
access.log = /proc/self/fd/2
1212
catch_workers_output = yes
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/with-contenv sh
2+
exec php-fpm5

files/php7/etc/php7/php-fpm.conf

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[global]
2+
pid = /var/run/php-fpm.pid
3+
error_log = /proc/self/fd/2
4+
log_level = notice
5+
daemonize = no
6+
7+
[www]
8+
user = root
9+
group = root
10+
listen = 127.0.0.1:9000
11+
access.log = /proc/self/fd/2
12+
catch_workers_output = yes
13+
pm = dynamic
14+
pm.max_children = 5
15+
pm.start_servers = 2
16+
pm.min_spare_servers = 1
17+
pm.max_spare_servers = 3
18+
pm.process_idle_timeout = 10s
19+
pm.max_requests = 500
20+
pm.status_path = /status
21+
ping.path = /ping

files/php7/etc/services.d/php-fpm7/finish

Whitespace-only changes.

0 commit comments

Comments
 (0)