Merge pull request #26 from dockeronfire/dockerfile-typo

Опечатка и новые версии

Author: tntrex

.gitlab-ci.yml

@@ -3,8 +3,8 @@ stages:
   - latest
 
 variables:
-  PHP_7_2: 7.2.21
-  PHP_7_3: 7.3.8
+  PHP_7_2: 7.2.23
+  PHP_7_3: 7.3.10
 
 .build: &build
   stage: build
@@ -17,7 +17,7 @@ variables:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - docker pull "$CACHE_FROM" || true
-    - docker build -t "$CI_REGISTRY_IMAGE:$DOCKER_IMAGE_TAG" --cache-from "$CACHE_FROM" --build-arg PHP_BASEIMAGE_VERION=$PHP_BASEIMAGE_VERION .
+    - docker build -t "$CI_REGISTRY_IMAGE:$DOCKER_IMAGE_TAG" --cache-from "$CACHE_FROM" --build-arg PHP_BASEIMAGE_VERSION=$PHP_BASEIMAGE_VERSION .
     - docker push "$CI_REGISTRY_IMAGE:$DOCKER_IMAGE_TAG"
 
 # PHP 7.2
@@ -27,7 +27,7 @@ build-next-7-2:
   <<: *build
   variables:
     DOCKER_IMAGE_TAG: next-7.2
-    PHP_BASEIMAGE_VERION: $PHP_7_2
+    PHP_BASEIMAGE_VERSION: $PHP_7_2
     CACHE_FROM: $CI_REGISTRY_IMAGE:next-7.2
   only:
     - next
@@ -36,7 +36,7 @@ build-master-7-2:
   <<: *build
   variables:
     DOCKER_IMAGE_TAG: latest-7.2
-    PHP_BASEIMAGE_VERION: $PHP_7_2
+    PHP_BASEIMAGE_VERSION: $PHP_7_2
     CACHE_FROM: $CI_REGISTRY_IMAGE:latest-7.2
   only:
     - master
@@ -45,7 +45,7 @@ build-tags-7-2:
   <<: *build
   variables:
     DOCKER_IMAGE_TAG: $CI_COMMIT_REF_NAME-7.2
-    PHP_BASEIMAGE_VERION: $PHP_7_2
+    PHP_BASEIMAGE_VERSION: $PHP_7_2
     CACHE_FROM: $CI_REGISTRY_IMAGE:latest-7.2
   only:
     - tags
@@ -57,7 +57,7 @@ build-next-7-3:
   <<: *build
   variables:
     DOCKER_IMAGE_TAG: next-7.3
-    PHP_BASEIMAGE_VERION: $PHP_7_3
+    PHP_BASEIMAGE_VERSION: $PHP_7_3
     CACHE_FROM: $CI_REGISTRY_IMAGE:next-7.3
   only:
     - next
@@ -66,7 +66,7 @@ build-master-7-3:
   <<: *build
   variables:
     DOCKER_IMAGE_TAG: latest-7.3
-    PHP_BASEIMAGE_VERION: $PHP_7_3
+    PHP_BASEIMAGE_VERSION: $PHP_7_3
     CACHE_FROM: $CI_REGISTRY_IMAGE:latest-7.3
   only:
     - master
@@ -75,7 +75,7 @@ build-tags-7-3:
   <<: *build
   variables:
     DOCKER_IMAGE_TAG: $CI_COMMIT_REF_NAME-7.3
-    PHP_BASEIMAGE_VERION: $PHP_7_3
+    PHP_BASEIMAGE_VERSION: $PHP_7_3
     CACHE_FROM: $CI_REGISTRY_IMAGE:latest-7.3
   only:
     - tags
@@ -88,7 +88,7 @@ build-next-latest:
   stage: latest
   variables:
     DOCKER_IMAGE_TAG: next
-    PHP_BASEIMAGE_VERION: $PHP_7_3
+    PHP_BASEIMAGE_VERSION: $PHP_7_3
     CACHE_FROM: $CI_REGISTRY_IMAGE:next-7.3
   only:
     - next
@@ -98,7 +98,7 @@ build-master-latest:
   stage: latest
   variables:
     DOCKER_IMAGE_TAG: latest
-    PHP_BASEIMAGE_VERION: $PHP_7_3
+    PHP_BASEIMAGE_VERSION: $PHP_7_3
     CACHE_FROM: $CI_REGISTRY_IMAGE:latest-7.3
   only:
     - master
@@ -108,7 +108,7 @@ build-tags-latest:
   stage: latest
   variables:
     DOCKER_IMAGE_TAG: $CI_COMMIT_REF_NAME
-    PHP_BASEIMAGE_VERION: $PHP_7_3
+    PHP_BASEIMAGE_VERSION: $PHP_7_3
     CACHE_FROM: $CI_REGISTRY_IMAGE:latest-7.3
   only:
     - tags

Dockerfile

@@ -1,5 +1,5 @@
-ARG PHP_BASEIMAGE_VERION=7.3.6
-FROM php:${PHP_BASEIMAGE_VERION}-fpm-alpine
+ARG PHP_BASEIMAGE_VERSION=7.3.6
+FROM php:${PHP_BASEIMAGE_VERSION}-fpm-alpine
 
 LABEL maintainer="Constantine Karnaukhov <[email protected]>"
 
@@ -13,46 +13,61 @@ ENV \
 # Install dependencies
 RUN echo @testing http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
 	apk add --no-cache \
-		nginx \
-		supervisor \
-		gomplate \
-		ssmtp \
-		mysql-client \
+		acl \
 		apk-cron \
+		augeas-dev \
+		autoconf \
 		bash \
-		su-exec \
-		git \
-		openssh-client \
-		wget \
 		curl \
-		libcurl \
-		augeas-dev \
-		libressl-dev \
 		ca-certificates \
 		dialog \
-		autoconf \
-		make \
+		freetype-dev \
+		gomplate \
+		git \
 		gcc \
-		musl-dev \
-		linux-headers \
+		icu-dev \
+		libcurl \
+		libffi-dev \
+		libgcrypt-dev \
+		libjpeg-turbo-dev \
 		libmcrypt-dev \
 		libpng-dev \
-		icu-dev \
 		libpq \
+		libressl-dev \
 		libxslt-dev \
-		libffi-dev \
-		freetype-dev \
-		sqlite-dev \
-		libjpeg-turbo-dev \
-		acl \
 		libzip-dev \
+		linux-headers \
+		make \
+		musl-dev \
+		mysql-client \
+		nginx \
+		openssh-client \
+		ssmtp \
+		sqlite-dev \
+		supervisor \
+		su-exec \
+		wget \
 		&& \
 	docker-php-ext-configure gd \
 		--with-gd \
 		--with-freetype-dir=/usr/include/ \
 		--with-png-dir=/usr/include/ \
 		--with-jpeg-dir=/usr/include/ && \
-	docker-php-ext-install iconv pdo_mysql pdo_sqlite mysqli gd exif intl xsl json soap dom zip opcache && \
+	docker-php-ext-install \
+		dom \
+		exif \
+		gd \
+		iconv \
+		intl \
+		json \
+		mysqli \
+		opcache \
+		pdo_mysql \
+		pdo_sqlite \
+		soap \
+		xsl \
+		zip \
+		&& \
 	pecl install xdebug-2.7.2 && \
 	docker-php-source delete && \
 	mkdir -p $COMPOSER_HOME && \