Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest alpine 3.4 version #1

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 19 additions & 19 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM alpine:3.3
FROM alpine:3.4

MAINTAINER Guillem CANAL <hello@guillem.ninja>

Expand All @@ -13,23 +13,23 @@ RUN apk add --update \
wget \
ca-certificates \
nginx \
php-fpm \
php-json \
php-zlib \
php-xml \
php-intl \
php-pdo \
php-phar \
php-openssl \
php-pdo_mysql \
php-mysqli \
php-gd \
php-iconv \
php-mcrypt \
php-dom \
php-ctype \
php-opcache \
php-curl \
php5-fpm \
php5-json \
php5-zlib \
php5-xml \
php5-intl \
php5-pdo \
php5-phar \
php5-openssl \
php5-pdo_mysql \
php5-mysqli \
php5-gd \
php5-iconv \
php5-mcrypt \
php5-dom \
php5-ctype \
php5-opcache \
php5-curl \
bash \

# Install PHP extensions not available via apk
Expand Down Expand Up @@ -71,4 +71,4 @@ WORKDIR /var/www
# Expose the ports for nginx
EXPOSE 80 443

ENTRYPOINT [ "/init" ]
ENTRYPOINT [ "/init" ]
Expand Up @@ -2,4 +2,4 @@
pid = /var/run/php-fpm.pid
error_log = /var/log/php-fpm.log
daemonize = no
include=/etc/php/pool.d/*.conf
include=/etc/php5/pool.d/*.conf
File renamed without changes.
6 changes: 3 additions & 3 deletions rootfs/sbin/build-php-extensions
@@ -1,5 +1,5 @@
#!/bin/sh
apk add alpine-sdk php-dev autoconf zlib-dev pcre-dev
apk add alpine-sdk php5-dev autoconf zlib-dev pcre-dev

pecl_install ()
{
Expand All @@ -17,12 +17,12 @@ pecl_install ()
./configure $CONFIGURE_ARGS
make
make install
echo "$EXT_TYPE=$NAME.so" >> /etc/php/conf.d/$NAME.ini
echo "$EXT_TYPE=$NAME.so" >> /etc/php5/conf.d/$NAME.ini
}

# Install PHP extensions
pecl_install extension apcu 4.0.10 --enable-apcu
pecl_install zend_extension xdebug 2.3.3 --enable-xdebug

# Cleanup
apk del autoconf php-dev zlib-dev pcre-dev alpine-sdk
apk del autoconf php5-dev zlib-dev pcre-dev alpine-sdk