Merge pull request #43 from spaceonfire/update-software-versions

update base image versions and xdebug default version

Author: tntrex

.gitlab-ci.yml

@@ -4,8 +4,8 @@ stages:
 
 variables:
   PHP_7_2: 7.2.33
-  PHP_7_3: 7.3.21
-  PHP_7_4: 7.4.9
+  PHP_7_3: 7.3.22
+  PHP_7_4: 7.4.10
   PHP_8_0: 8.0-rc
 
 .build:

Dockerfile

@@ -1,4 +1,4 @@
-ARG PHP_BASEIMAGE_VERSION=7.4.9
+ARG PHP_BASEIMAGE_VERSION=7.4.10
 FROM php:${PHP_BASEIMAGE_VERSION}-fpm-alpine
 
 LABEL maintainer="Constantine Karnaukhov <[email protected]>"
@@ -10,15 +10,11 @@ ENV \
 	# Fix for iconv: https://github.com/docker-library/php/issues/240
 	LD_PRELOAD="/usr/lib/preloadable_libiconv.so php"
 
-ARG XDEBUG_VERSION=2.9.6
+ARG XDEBUG_VERSION=2.9.8
 ARG PHP_EXTENSIONS="dom exif gd iconv intl json mysqli opcache pdo_mysql pdo_sqlite soap xsl zip"
 
 # Install dependencies
-RUN { \
-		echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main"; \
-		echo "@community http://dl-cdn.alpinelinux.org/alpine/edge/community"; \
-	} >> /etc/apk/repositories && \
-	apk add --update \
+RUN apk add --update \
 		acl \
 		apk-cron \
 		augeas-dev \
@@ -46,14 +42,14 @@ RUN { \
 		make \
 		musl-dev \
 		mysql-client \
-		nginx@edge \
+		nginx \
 		openssh-client \
 		ssmtp \
 		sqlite-dev \
 		supervisor \
 		su-exec \
 		wget \
-		gnu-libiconv@community \
+		gnu-libiconv \
 		&& \
 	docker-php-ext-configure gd \
 		--with-gd \

README.md

@@ -21,9 +21,9 @@ Docker образ, основанный на Alpine Linux, с установле
 
 | Docker Tag                            | PHP Version |
 | ------------------------------------- | ----------- |
-| `latest` / `latest-7.4` / `2.4.1-7.4` | 7.4.9       |
-| `latest-7.3` / `2.4.1-7.3`            | 7.3.21      |
-| `latest-7.2` / `2.4.1-7.2`            | 7.2.33      |
+| `latest` / `latest-7.4` / `2.4.2-7.4` | 7.4.10      |
+| `latest-7.3` / `2.4.2-7.3`            | 7.3.22      |
+| `latest-7.2` / `2.4.2-7.2`            | 7.2.33      |
 | `next-8.0-rc`                         | 8.0.0-rc    |
 
 ## Быстрый старт