PHP upgraded to version 7.4 (#1737)

shopsys · Apr 20, 2020 · 3275520 · 3275520
1 parent 2f97c8a
commit 3275520
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
         "prezent/doctrine-translatable-bundle": "^1.0.3",
         "sensio/framework-extra-bundle": "^5.2",
         "sensiolabs/security-checker": "^6.0",
-        "shopsys/doctrine-orm": "^2.6.2",
+        "shopsys/doctrine-orm": "^2.6.6",
         "shopsys/google-cloud-bundle": "9.0.x-dev",
         "shopsys/postgres-search-bundle": "^0.2",
         "shopsys/migrations": "9.0.x-dev",

diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.3-fpm-stretch as base
+FROM php:7.4-fpm-buster as base
 
 ARG project_root=.
 
@@ -44,7 +44,7 @@ RUN apt-get update && \
     apt-get clean
 
 # "gd" extension needs to have specified jpeg and freetype dir for jpg/jpeg images support
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg
 
 # install necessary tools for running application
 RUN docker-php-ext-install \