Merge pull request #4 from andrewmy/add-php-7.4

Add PHP 7.4, remove older

Author: makasim

7.2/base/entrypoint.sh

@@ -1,35 +1,34 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 MAINTAINER Maksim Kotliar <kotlyar.maksim@gmail.com>
 
 ENV LC_ALL=C.UTF-8
 
 RUN apt-get update && \
-    apt-get -y --no-install-recommends --no-install-suggests install software-properties-common python-software-properties && \
+    apt-get -y --no-install-recommends --no-install-suggests install software-properties-common && \
     add-apt-repository ppa:ondrej/php && \
     add-apt-repository ppa:ondrej/pkg-gearman && \
     rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update && \
-    apt-get remove php7.0 && \
-    apt-get install -y --no-install-recommends --no-install-suggests nginx php7.2 php7.2-fpm php7.2-cli php7.2-common ca-certificates gettext && \
+    apt-get install -y --no-install-recommends --no-install-suggests nginx php7.4 php7.4-fpm php7.4-cli php7.4-common ca-certificates gettext && \
     rm -rf /var/lib/apt/lists/*
 
 # forward request and error logs to docker log collector
 RUN ln -sf /dev/stderr /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log \
-	&& ln -sf /dev/stderr /var/log/php7.2-fpm.log \
+	&& ln -sf /dev/stderr /var/log/php7.4-fpm.log \
 	&& ln -sf /dev/stderr /var/log/php-fpm.log
 
 RUN rm -f /etc/nginx/sites-enabled/*
 
 COPY nginx.conf.tpl /nginx.conf.tpl
 COPY nginx_ssl.conf.tpl /nginx_ssl.conf.tpl
 COPY php-fpm.conf.tpl /php-fpm.conf.tpl
-COPY defaults.ini /etc/php/7.2/cli/conf.d/defaults.ini
-COPY defaults.ini /etc/php/7.2/fpm/conf.d/defaults.ini
+COPY defaults.ini /etc/php/7.4/cli/conf.d/defaults.ini
+COPY defaults.ini /etc/php/7.4/fpm/conf.d/defaults.ini
 
-RUN mkdir -p /run/php && touch /run/php/php7.2-fpm.sock && touch /run/php/php7.2-fpm.pid
+RUN mkdir -p /run/php && touch /run/php/php7.4-fpm.sock && touch /run/php/php7.4-fpm.pid
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod 755 /entrypoint.sh

7.2/base/php-fpm.conf.tpl

@@ -50,5 +50,5 @@ http {
 		location ~ \.php$ {
 		  return 404;
 		}
-    	}
+	}
 }

7.2/build-images.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+(cd 7.4/base && docker build --rm --pull -t makasim/nginx-php-fpm:7.4 .)
+(cd 7.4/php-all-exts && docker build --rm -t makasim/nginx-php-fpm:7.4-all-exts .)

7.2/php-all-exts/Dockerfile

@@ -0,0 +1,10 @@
+FROM makasim/nginx-php-fpm:7.4
+
+# exts
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends --no-install-suggests \
+    php7.4-mongodb php7.4-curl php7.4-intl php7.4-soap php7.4-xml php7.4-bcmath \
+    php7.4-mysql php7.4-amqp php7.4-gearman php7.4-mbstring php7.4-ldap php7.4-zip php7.4-gd php7.4-xdebug php7.4-imagick && \
+    rm -f /etc/php/7.4/cli/conf.d/*xdebug.ini && \
+    rm -f /etc/php/7.4/fpm/conf.d/*xdebug.ini && \
+    rm -rf /var/lib/apt/lists/*

7.3/base/Dockerfile

@@ -4,5 +4,5 @@ set -x
 set -e
 
 docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-docker push makasim/nginx-php-fpm:7.2
-docker push makasim/nginx-php-fpm:7.2-all-exts
+docker push makasim/nginx-php-fpm:7.4
+docker push makasim/nginx-php-fpm:7.4-all-exts