Upgrade to latest alpine 3.4 version

guillemcanal · Jun 19, 2016 · c02685a · c02685a
1 parent c27613e
commit c02685a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4
 
 MAINTAINER Guillem CANAL <hello@guillem.ninja> 
 
@@ -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
@@ -71,4 +71,4 @@ WORKDIR /var/www
 # Expose the ports for nginx
 EXPOSE 80 443
 
-ENTRYPOINT [ "/init" ]
+ENTRYPOINT [ "/init" ]
diff --git a/rootfs/sbin/build-php-extensions b/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 ()
 {
@@ -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