From 8814c6a7888ffa521de4d8d06454e29992b87dc7 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 15 Oct 2014 15:01:24 -0600 Subject: [PATCH] Drop older php 5.3 it fails when trying to build with ssl --- 5.3/Dockerfile | 40 ----------------------------- 5.3/apache/Dockerfile | 52 ------------------------------------- 5.3/apache/apache2.conf | 57 ----------------------------------------- 3 files changed, 149 deletions(-) delete mode 100644 5.3/Dockerfile delete mode 100644 5.3/apache/Dockerfile delete mode 100644 5.3/apache/apache2.conf diff --git a/5.3/Dockerfile b/5.3/Dockerfile deleted file mode 100644 index c0c506edcd..0000000000 --- a/5.3/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM buildpack-deps:jessie - -RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/* - -#### -#### - -RUN gpg --keyserver pgp.mit.edu --recv-keys 0B96609E270F565C13292B24C13C70B87267B52D 0A95E9A026542D53835E3F3A7DEC4E69FC9C83D7 - -ENV PHP_VERSION 5.3.29 - -# php 5.3 needs older autoconf -RUN set -x \ - && apt-get update && apt-get install -y autoconf2.13 && rm -r /var/lib/apt/lists/* \ - && curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \ - && curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \ - && dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \ - && dpkg -i bison_2.7.1.dfsg-1_amd64.deb \ - && rm *.deb \ - && curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \ - && curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \ - && gpg --verify php.tar.bz2.asc \ - && mkdir -p /usr/src/php \ - && tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \ - && rm php.tar.bz2* \ - && cd /usr/src/php \ - && ./buildconf --force \ - && ./configure --disable-cgi \ - $(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \ - --with-mysql \ - --with-mysqli \ - --with-pdo-mysql \ - --with-openssl \ - && make -j"$(nproc)" \ - && make install \ - && dpkg -r bison libbison-dev \ - && apt-get purge -y --auto-remove autoconf2.13 \ - && rm -r /usr/src/php - -CMD ["php", "-a"] diff --git a/5.3/apache/Dockerfile b/5.3/apache/Dockerfile deleted file mode 100644 index e8d075e0aa..0000000000 --- a/5.3/apache/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -FROM buildpack-deps:jessie - -RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/* - -#### -RUN apt-get update && apt-get install -y apache2-bin apache2-dev apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/* - -RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html - -# Apache + PHP requires preforking Apache for best results -RUN a2dismod mpm_event && a2enmod mpm_prefork - -RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist -COPY apache2.conf /etc/apache2/apache2.conf -#### - -RUN gpg --keyserver pgp.mit.edu --recv-keys 0B96609E270F565C13292B24C13C70B87267B52D 0A95E9A026542D53835E3F3A7DEC4E69FC9C83D7 - -ENV PHP_VERSION 5.3.29 - -# php 5.3 needs older autoconf -RUN set -x \ - && apt-get update && apt-get install -y autoconf2.13 && rm -r /var/lib/apt/lists/* \ - && curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \ - && curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \ - && dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \ - && dpkg -i bison_2.7.1.dfsg-1_amd64.deb \ - && rm *.deb \ - && curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \ - && curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \ - && gpg --verify php.tar.bz2.asc \ - && mkdir -p /usr/src/php \ - && tar -xf php.tar.bz2 -C /usr/src/php --strip-components=1 \ - && rm php.tar.bz2* \ - && cd /usr/src/php \ - && ./buildconf --force \ - && ./configure --disable-cgi \ - $(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \ - --with-mysql \ - --with-mysqli \ - --with-pdo-mysql \ - --with-openssl \ - && make -j"$(nproc)" \ - && make install \ - && dpkg -r bison libbison-dev \ - && apt-get purge -y --auto-remove autoconf2.13 \ - && rm -r /usr/src/php - -WORKDIR /var/www/html - -EXPOSE 80 -CMD ["apache2", "-DFOREGROUND"] diff --git a/5.3/apache/apache2.conf b/5.3/apache/apache2.conf deleted file mode 100644 index 85ef37884d..0000000000 --- a/5.3/apache/apache2.conf +++ /dev/null @@ -1,57 +0,0 @@ -# see http://sources.debian.net/src/apache2/2.4.10-1/debian/config-dir/apache2.conf - -Mutex file:/var/lock/apache2 default -PidFile /var/run/apache2/apache2.pid -Timeout 300 -KeepAlive On -MaxKeepAliveRequests 100 -KeepAliveTimeout 5 -User www-data -Group www-data -HostnameLookups Off -ErrorLog /proc/self/fd/2 -LogLevel warn - -IncludeOptional mods-enabled/*.load -IncludeOptional mods-enabled/*.conf - -# ports.conf -Listen 80 - - Listen 443 - - - Listen 443 - - - - Options FollowSymLinks - AllowOverride None - Require all denied - - - - Options Indexes FollowSymLinks - AllowOverride All - Require all granted - - -AccessFileName .htaccess - - Require all denied - - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -CustomLog /proc/self/fd/1 combined - - - SetHandler application/x-httpd-php - -DirectoryIndex index.php - -DocumentRoot /var/www/html