Add php apcu

mblaschke · mblaschke · commit 61c8272fd906 · 2016-06-15T22:58:40.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
 
 ## [1.0.0] - upcoming
 
+## [0.50.7] - upcoming
+### Added
+- Added php module apcu
+
 ## [0.50.6] - 2016-06-14
 ### Changed
 - Switch from dotdeb to sury and install libpcre3 from testing
diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile
@@ -49,7 +49,7 @@ RUN /usr/local/bin/apk-install \
         php7-xmlreader \
         php7-exif \
         php7-ftp \
-        php7-gettext \
+        php7-gemttext \
         php7-iconv \
         php7-zip \
         php7-zlib \
@@ -69,6 +69,7 @@ RUN /usr/local/bin/apk-install \
         php7-opcache \
         php7-mbstring \
         php7-iconv \
+        php7-apcu \
     && ln -s /usr/bin/php7      /usr/bin/php \
     && ln -s /usr/sbin/php-fpm7 /usr/sbin/php-fpm \
     && pear channel-update pear.php.net \
diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile
@@ -65,6 +65,7 @@ RUN /usr/local/bin/apk-install \
         php-pear \
         php-phar \
         php-openssl \
+        php-apcu \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
     && pear config-set auto_discover 1 \
diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile
@@ -45,6 +45,7 @@ RUN /usr/local/bin/yum-install \
         ImageMagick-devel \
         ImageMagick-perl \
         php-pear \
+        php-pecl-apcu \
         php-devel \
         gcc \
         php-pear \
diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile
@@ -54,6 +54,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
         php7.0-soap \
         php7.0-bcmath \
         php7.0-mbstring \
+        php-apcu \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
     && /opt/docker/bin/bootstrap.sh
diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile
@@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \
         php5-memcached \
         php5-imagick \
         php5-redis \
+        php5-apcu \
         php-pear \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
         php7.0-xmlrpc \
         php7.0-xsl \
         php7.0-bz2 \
+        php-apcu \
         php-redis \
         php-memcache \
         php-memcached \
diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile
@@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \
         php5-memcached \
         php5-imagick \
         php5-redis \
+        php5-apcu \
         php-pear \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile
@@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \
         php5-memcached \
         php5-imagick \
         php5-redis \
+        php5-apcu \
         php-pear \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile
@@ -39,6 +39,7 @@ RUN /usr/local/bin/apt-install \
         php5-memcached \
         php5-imagick \
         php5-redis \
+        php5-apcu \
         php-pear \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile
@@ -40,6 +40,7 @@ RUN /usr/local/bin/apt-install \
         php7.0-xmlrpc \
         php7.0-xsl \
         php7.0-bz2 \
+        php-apcu \
         php-redis \
         php-memcached \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2
@@ -50,6 +50,7 @@ RUN /usr/local/bin/apk-install \
         php-pear \
         php-phar \
         php-openssl \
+        php-apcu \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
     && pear config-set auto_discover 1 \
@@ -88,6 +89,7 @@ RUN /usr/local/bin/yum-install \
         ImageMagick-devel \
         ImageMagick-perl \
         php-pear \
+        php-pecl-apcu \
         php-devel \
         gcc \
         php-pear \
@@ -158,6 +160,7 @@ RUN /usr/local/bin/apt-install \
         php5-memcached \
         php5-imagick \
         php5-redis \
+        php5-apcu \
         php-pear \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
@@ -262,6 +265,7 @@ RUN /usr/local/bin/apt-install \
         php5-memcached \
         php5-imagick \
         php5-redis \
+        php5-apcu \
         php-pear \
     && pear channel-update pear.php.net \
     && pear upgrade-all \
@@ -294,6 +298,7 @@ RUN /usr/local/bin/apt-install \
         php5-ldap \
         php5-memcache \
         php5-imagick \
+        php5-apcu \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2
@@ -34,7 +34,7 @@ RUN /usr/local/bin/apk-install \
         php7-xmlreader \
         php7-exif \
         php7-ftp \
-        php7-gettext \
+        php7-gemttext \
         php7-iconv \
         php7-zip \
         php7-zlib \
@@ -54,6 +54,7 @@ RUN /usr/local/bin/apk-install \
         php7-opcache \
         php7-mbstring \
         php7-iconv \
+        php7-apcu \
     && ln -s /usr/bin/php7      /usr/bin/php \
     && ln -s /usr/sbin/php-fpm7 /usr/sbin/php-fpm \
     && pear channel-update pear.php.net \
@@ -89,6 +90,7 @@ RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sou
         php7.0-bz2 \
         php7.0-redis \
         php7.0-memcached \
+        php-apcu \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
     {{ provision.runRoleInline('php', role) }}
 {%- endmacro %}
@@ -132,6 +134,7 @@ RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
         php7.0-soap \
         php7.0-bcmath \
         php7.0-mbstring \
+        php-apcu \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
     {{ provision.runRoleInline('php', role) }}
 {%- endmacro %}
@@ -161,6 +164,7 @@ RUN /usr/local/bin/apt-install \
         php7.0-xmlrpc \
         php7.0-xsl \
         php7.0-bz2 \
+        php-apcu \
         php-redis \
         php-memcache \
         php-memcached \
@@ -193,6 +197,7 @@ RUN /usr/local/bin/apt-install \
         php7.0-xmlrpc \
         php7.0-xsl \
         php7.0-bz2 \
+        php-apcu \
         php-redis \
         php-memcached \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
diff --git a/test/spec/shared/php/modules.rb b/test/spec/shared/php/modules.rb
@@ -4,8 +4,6 @@
 
 shared_examples 'php::modules' do
     describe command('php -m') do
-        its(:stdout) { should_not contain('apc') }
-
         its(:stdout) { should     contain('bcmath') }
         its(:stdout) { should     contain('bz2') }
         its(:stdout) { should     contain('calendar') }
@@ -60,6 +58,13 @@
             its(:stdout) { should     contain('gd') }
         end
 
+        if !(
+                (os[:family] == 'ubuntu' and os[:version] == '12.04' ) or
+                (os[:family] == 'debian' and os[:version] == '7' )
+            )
+            its(:stdout) { should     contain('apcu') }
+        end
+
         its(:exit_status) { should eq 0 }
     end
 end
@@ -119,8 +124,6 @@
 
 shared_examples 'php-fpm::modules' do
     describe command('curl --insecure --silent --retry 10 --fail http://localhost/php-test.php?test=get_loaded_extensions') do
-        its(:stdout) { should_not contain('apc') }
-
         its(:stdout) { should     contain('bcmath') }
         its(:stdout) { should     contain('bz2') }
         its(:stdout) { should     contain('calendar') }
@@ -175,6 +178,13 @@
             its(:stdout) { should     contain('gd') }
         end
 
+        if !(
+                (os[:family] == 'ubuntu' and os[:version] == '12.04' ) or
+                (os[:family] == 'debian' and os[:version] == '7' )
+            )
+            its(:stdout) { should     contain('apcu') }
+        end
+
         its(:exit_status) { should eq 0 }
     end
 end
