fix docker for work with 8.0 and 8.2 versions

otis22 · Jun 20, 2023 · d5ea92f · d5ea92f
1 parent f32cca4
commit d5ea92f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-default_php_version:=7.4
+default_php_version:=8.1
 php_version:=$(PHP_VERSION)
 ifndef PHP_VERSION
 	php_version:=$(default_php_version)

diff --git a/README.md b/README.md
@@ -413,11 +413,11 @@ or connect to terminal
 ```shell
 make exec
 ```
-*Dafault php version is 7.4*. Use PHP_VERSION= for using custom version.
+*Dafault php version is 8.1*. Use PHP_VERSION= for using custom version. Now is available only 8.0 and 8.1 versions.
 ```shell
 make all PHP_VERSION=8.0
 # run both 
-make all PHP_VERSION=7.4 && make all PHP_VERSION=8.0
+make all PHP_VERSION=8.0 && make all PHP_VERSION=8.1
 ```
 
 *For integration tests copy .env.example to .env and fill with yours values*

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -4,11 +4,15 @@ FROM php:${VERSION}-cli-alpine
 
 WORKDIR /app
 
-RUN apk --no-cache add pcre-dev ${PHPIZE_DEPS} \
-  && pecl install xdebug \
-  && apk del pcre-dev ${PHPIZE_DEPS}
+RUN apk add --update linux-headers \
+    && apk --no-cache add  icu-libs \
+    && apk --no-cache add icu-data-full \
+    && apk --no-cache add icu-dev \
+    && apk --no-cache add pcre-dev ${PHPIZE_DEPS} \
+    && pecl install xdebug \
+    && apk del pcre-dev ${PHPIZE_DEPS}
 
-RUN docker-php-ext-install -j$(nproc) bcmath
+RUN docker-php-ext-install -j$(nproc) bcmath intl
 
 RUN curl -sS https://getcomposer.org/installer | \
-    php -- --2 --install-dir=/usr/local/bin --filename=composer
+    php -- --2 --install-dir=/usr/local/bin --filename=composer