Merge pull request martin-helmich#16 from martin-helmich/bugfix/adjus…

…t-new-php-image Fix breaking 8.7 build, adjust to new PHP 7.2 image
greenbananaCH · Dec 1, 2017 · 7df0b0b · 7df0b0b
2 parents 2941514 + 258be44
commit 7df0b0b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/6.2/Dockerfile b/6.2/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:5.6-apache
-MAINTAINER Martin Helmich <typo3@martin-helmich.de>
+LABEL maintainer="Martin Helmich <typo3@martin-helmich.de>"
 
 # Install TYPO3
 RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \

diff --git a/7.6/Dockerfile b/7.6/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:5.6-apache
-MAINTAINER Martin Helmich <typo3@martin-helmich.de>
+LABEL maintainer="Martin Helmich <typo3@martin-helmich.de>"
 
 # Install TYPO3
 RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \

diff --git a/8.7/Dockerfile b/8.7/Dockerfile
@@ -1,23 +1,18 @@
-FROM php:7-apache
-MAINTAINER Martin Helmich <typo3@martin-helmich.de>
+FROM php:7.2-apache
+LABEL maintainer="Martin Helmich <typo3@martin-helmich.de>"
 
 # Install TYPO3
-RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \
-    echo "Package: *\\nPin: release n=jessie\\nPin-Priority: 900\\n\\nPackage: libpcre3*\\nPin: release n=stretch\\nPin-Priority: 1000" > /etc/apt/preferences && \
-    apt-get update && \
+RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         wget \
 # Configure PHP
         libxml2-dev libfreetype6-dev \
         libjpeg62-turbo-dev \
         libmcrypt-dev \
-        libpng12-dev \
+        libpng-dev \
         zlib1g-dev \
 # Install required 3rd party tools
         graphicsmagick && \
-# Fix outdated PCRE bug in Debian 8
-    apt-get install -y -t stretch libpcre3 libpcre3-dev && \
-
 # Configure extensions
     docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
     docker-php-ext-install -j$(nproc) mysqli soap gd zip opcache && \

diff --git a/Dockerfile.in b/Dockerfile.in
@@ -1,5 +1,5 @@
 FROM php:PHPVER-apache
-MAINTAINER Martin Helmich <typo3@martin-helmich.de>
+LABEL maintainer="Martin Helmich <typo3@martin-helmich.de>"
 
 # Install TYPO3
 RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \

diff --git a/Makefile b/Makefile
@@ -10,6 +10,3 @@ all: $(DOCKERFILES)
 7.6/Dockerfile: $(DEPENDS)
 	sed -e 's/PHPVER/5.6/' -e 's/TYPOVER/7.6/' $< > $@
 
-8.7/Dockerfile: $(DEPENDS)
-	sed -e 's/PHPVER/7/' -e 's/TYPOVER/8.7/' $< > $@
-