Stabilze php5 and php7 for alpine

Removed redis and memcached module (not available)
webdevops · Jan 8, 2017 · 1b53a3b · 1b53a3b
1 parent 62c52b8
commit 1b53a3b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/conf/console.yml b/conf/console.yml
@@ -44,6 +44,7 @@ dockerTest:
         OS_FAMILY: 'alpine'
         OS_VERSION: '3'
         PHP_MHASH: '0'
+        PHP_REDIS: '0'
       ':ubuntu-12.04':
         OS_FAMILY: 'ubuntu'
         OS_VERSION: '12.04'

diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile
@@ -20,10 +20,8 @@ ADD baselayout.tar /
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \
-    # Add testing
-    && echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories \
     # Add community
-    && echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
+    && echo http://dl-4.alpinelinux.org/alpine/v3.5/community/ >> /etc/apk/repositories \
     # System update
     && /usr/local/bin/apk-upgrade \
     # Install base stuff

diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile
@@ -31,7 +31,6 @@ RUN /usr/local/bin/apk-install \
         php7-mysqlnd \
         php7-pdo_mysql \
         php7-pdo_sqlite \
-        php7-memcached \
         php7-mcrypt \
         php7-gd \
         php7-bcmath \
@@ -60,8 +59,8 @@ RUN /usr/local/bin/apk-install \
         php7-xsl \
         geoip \
         php7-ldap \
-        #php7-memcache \
-        php7-redis \
+        # php7-memcache \
+        # php7-redis \
         php7-pear \
         php7-phar \
         php7-openssl \

diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile
@@ -32,7 +32,6 @@ RUN /usr/local/bin/apk-install \
         php5-mysqli \
         php5-pdo_mysql \
         php5-pdo_sqlite \
-        php5-memcached \
         php5-mcrypt \
         php5-gd \
         php5-bcmath \
@@ -62,7 +61,7 @@ RUN /usr/local/bin/apk-install \
         geoip \
         php5-ldap \
         php5-memcache \
-        php5-redis \
+        # php5-redis \
         php5-pear \
         php5-phar \
         php5-openssl \

diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2
@@ -3,10 +3,8 @@
 RUN set -x \
     # Fix root terminal
     && echo "export TERM=xterm" >> /root/.bashrc \
-    # Add testing
-    && echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories \
     # Add community
-    && echo http://dl-cdn.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
+    && echo http://dl-4.alpinelinux.org/alpine/v3.5/community/ >> /etc/apk/repositories \
     # System update
     && /usr/local/bin/apk-upgrade \
     # Install base stuff

diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2
@@ -17,7 +17,6 @@ RUN /usr/local/bin/apk-install \
         php5-mysqli \
         php5-pdo_mysql \
         php5-pdo_sqlite \
-        php5-memcached \
         php5-mcrypt \
         php5-gd \
         php5-bcmath \
@@ -47,7 +46,7 @@ RUN /usr/local/bin/apk-install \
         geoip \
         php5-ldap \
         php5-memcache \
-        php5-redis \
+        # php5-redis \
         php5-pear \
         php5-phar \
         php5-openssl \

diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2
@@ -16,7 +16,6 @@ RUN /usr/local/bin/apk-install \
         php7-mysqlnd \
         php7-pdo_mysql \
         php7-pdo_sqlite \
-        php7-memcached \
         php7-mcrypt \
         php7-gd \
         php7-bcmath \
@@ -45,8 +44,8 @@ RUN /usr/local/bin/apk-install \
         php7-xsl \
         geoip \
         php7-ldap \
-        #php7-memcache \
-        php7-redis \
+        # php7-memcache \
+        # php7-redis \
         php7-pear \
         php7-phar \
         php7-openssl \