@@ -2,43 +2,50 @@ FROM alpine:3.4
22
33MAINTAINER ngineered <support@ngineered.co.uk>
44
5- ENV php_conf /etc/php5 /php.ini
6- ENV fpm_conf /etc/php5 /php-fpm.conf
7- ENV composer_hash e115a8dc7871f15d853148a7fbac7da27d6c0030b848d9b3dc09e2a0388afed865e6a3d6b3c0fad45c48e2b5fc1196ae
5+ ENV php_conf /etc/php7 /php.ini
6+ ENV fpm_conf /etc/php7 /php-fpm.conf
7+ ENV composer_hash 61069fe8c6436a4468d0371454cf38a812e451a14ab1691543f25a9627b97ff96d8753d92a00654c21e2212a5ae1ff36
88
9- RUN apk add --no-cache bash \
9+ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
10+ sed -i -e "s/v3.4/edge/" /etc/apk/repositories && \
11+ echo /etc/apk/respositories && \
12+ apk update && \
13+ apk add --no-cache bash \
1014 openssh-client \
1115 wget \
1216 nginx \
1317 supervisor \
1418 curl \
1519 git \
16- php5-fpm \
17- php5-pdo \
18- php5-pdo_mysql \
19- php5-mysql \
20- php5-mysqli \
21- php5-mcrypt \
22- php5-ctype \
23- php5-zlib \
24- php5-gd \
25- php5-intl \
26- php5-memcache \
27- php5-sqlite3 \
28- php5-pgsql \
29- php5-xml \
30- php5-xsl \
31- php5-curl \
32- php5-openssl \
33- php5-iconv \
34- php5-json \
35- php5-phar \
36- php5-soap \
37- php5-dom \
38- php5-zip \
20+ php7-fpm \
21+ php7-pdo \
22+ php7-pdo_mysql \
23+ php7-mysqlnd \
24+ php7-mysqli \
25+ php7-mcrypt \
26+ php7-mbstring \
27+ php7-ctype \
28+ php7-zlib \
29+ php7-gd \
30+ php7-exif \
31+ php7-intl \
32+ php7-sqlite3 \
33+ php7-pdo_pgsql \
34+ php7-pgsql \
35+ php7-xml \
36+ php7-xsl \
37+ php7-curl \
38+ php7-openssl \
39+ php7-iconv \
40+ php7-json \
41+ php7-phar \
42+ php7-soap \
43+ php7-dom \
44+ php7-zip \
45+ php7-session \
3946 python \
4047 python-dev \
41- py -pip \
48+ py2 -pip \
4249 augeas-dev \
4350 openssl-dev \
4451 ca-certificates \
@@ -50,11 +57,12 @@ RUN apk add --no-cache bash \
5057 mkdir -p /etc/nginx && \
5158 mkdir -p /var/www/app && \
5259 mkdir -p /run/nginx && \
53- mkdir -p /var/log/supervisor &&\
54- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
55- php -r "if (hash_file('SHA384', 'composer-setup.php') === '${composer_hash}') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
56- php composer-setup.php --install-dir=/usr/bin --filename=composer && \
57- php -r "unlink('composer-setup.php');" && \
60+ mkdir -p /var/log/supervisor && \
61+ php7 -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
62+ php7 -r "if (hash_file('SHA384', 'composer-setup.php') === '${composer_hash}') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
63+ php7 composer-setup.php --install-dir=/usr/bin --filename=composer && \
64+ php7 -r "unlink('composer-setup.php');" && \
65+ pip install -U pip && \
5866 pip install -U certbot && \
5967 mkdir -p /etc/letsencrypt/webrootauth && \
6068 apk del gcc musl-dev linux-headers libffi-dev augeas-dev python-dev
@@ -77,30 +85,39 @@ ADD conf/nginx-site-ssl.conf /etc/nginx/sites-available/default-ssl.conf
7785RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf
7886
7987# tweak php-fpm config
80- RUN sed -i -e "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g" ${php_conf} && \
81- sed -i -e "s/upload_max_filesize\s *=\s *2M/upload_max_filesize = 100M/g" ${php_conf} && \
82- sed -i -e "s/post_max_size\s *=\s *8M/post_max_size = 100M/g" ${php_conf} && \
83- sed -i -e "s/variables_order = \" GPCS\" /variables_order = \" EGPCS\" /g" ${php_conf} && \
84- sed -i -e "s/;daemonize\s *=\s *yes/daemonize = no/g" ${fpm_conf} && \
85- sed -i -e "s/;catch_workers_output\s *=\s *yes/catch_workers_output = yes/g" ${fpm_conf} && \
86- sed -i -e "s/pm.max_children = 4/pm.max_children = 4/g" ${fpm_conf} && \
87- sed -i -e "s/pm.start_servers = 2/pm.start_servers = 3/g" ${fpm_conf} && \
88- sed -i -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 2/g" ${fpm_conf} && \
89- sed -i -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 4/g" ${fpm_conf} && \
90- sed -i -e "s/pm.max_requests = 500/pm.max_requests = 200/g" ${fpm_conf} && \
91- sed -i -e "s/user = nobody/user = nginx/g" ${fpm_conf} && \
92- sed -i -e "s/group = nobody/group = nginx/g" ${fpm_conf} && \
93- sed -i -e "s/;listen.mode = 0660/listen.mode = 0666/g" ${fpm_conf} && \
94- sed -i -e "s/;listen.owner = nobody/listen.owner = nginx/g" ${fpm_conf} && \
95- sed -i -e "s/;listen.group = nobody/listen.group = nginx/g" ${fpm_conf} && \
96- sed -i -e "s/listen = 127.0.0.1:9000/listen = \/ var\/ run\/ php-fpm.sock/g" ${fpm_conf} &&\
97- sed -i -e "s/^;clear_env = no$/clear_env = no/" ${fpm_conf} &&\
98- ln -s /etc/php5/php.ini /etc/php5/conf.d/php.ini && \
99- find /etc/php5/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s *)#(.*)/1円 ;2円 /g' {} \;
88+ RUN sed -i \
89+ -e "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g" \
90+ -e "s/upload_max_filesize\s *=\s *2M/upload_max_filesize = 100M/g" \
91+ -e "s/post_max_size\s *=\s *8M/post_max_size = 100M/g" \
92+ -e "s/variables_order = \" GPCS\" /variables_order = \" EGPCS\" /g" \
93+ ${php_conf} && \
94+ sed -i \
95+ -e "s/;daemonize\s *=\s *yes/daemonize = no/g" \
96+ -e "s/;catch_workers_output\s *=\s *yes/catch_workers_output = yes/g" \
97+ -e "s/pm.max_children = 4/pm.max_children = 4/g" \
98+ -e "s/pm.start_servers = 2/pm.start_servers = 3/g" \
99+ -e "s/pm.min_spare_servers = 1/pm.min_spare_servers = 2/g" \
100+ -e "s/pm.max_spare_servers = 3/pm.max_spare_servers = 4/g" \
101+ -e "s/pm.max_requests = 500/pm.max_requests = 200/g" \
102+ -e "s/user = nobody/user = nginx/g" \
103+ -e "s/group = nobody/group = nginx/g" \
104+ -e "s/;listen.mode = 0660/listen.mode = 0666/g" \
105+ -e "s/;listen.owner = nobody/listen.owner = nginx/g" \
106+ -e "s/;listen.group = nobody/listen.group = nginx/g" \
107+ -e "s/listen = 127.0.0.1:9000/listen = \/ var\/ run\/ php-fpm.sock/g" \
108+ -e "s/^;clear_env = no$/clear_env = no/" \
109+ ${fpm_conf} && \
110+ ln -s /etc/php7/php.ini /etc/php7/conf.d/php.ini && \
111+ find /etc/php7/conf.d/ -name "*.ini" -exec sed -i -re 's/^(\s *)#(.*)/1円 ;2円 /g' {} \;
100112
101113# Install/setup Python deps
102114RUN pip install requests
103115
116+ # Install WP-CLI
117+ RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
118+ RUN chmod +x wp-cli.phar
119+ RUN sudo mv wp-cli.phar /usr/local/bin/wp
120+ 104121# Add Scripts
105122ADD scripts/start.sh /start.sh
106123ADD scripts/pull /usr/bin/pull
0 commit comments