Merge branch '1.10'

* 1.10: Update composer.json branch-alias [Docker] Update PHP and Node deps [Docker] Remove python dependency
windragon0910 · Jan 3, 2022 · a90b6ed · a90b6ed
2 parents 86f7a34 + cbf919b
commit a90b6ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 # the different stages of this Dockerfile are meant to be built into separate images
 # https://docs.docker.com/compose/compose-file/#target
 
-ARG PHP_VERSION=7.4
-ARG NODE_VERSION=12
+ARG PHP_VERSION=8.0
+ARG NODE_VERSION=14
 ARG NGINX_VERSION=1.21
 
 FROM php:${PHP_VERSION}-fpm-alpine AS sylius_php
@@ -118,7 +118,6 @@ RUN set -eux; \
 		gcc \
 		git \
 		make \
-		python2 \
 	;
 
 # prevent the reinstallation of vendors at every changes in the source code

diff --git a/composer.json b/composer.json
@@ -69,7 +69,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.9-dev"
+            "dev-master": "1.10-dev"
         },
         "symfony": {
             "allow-contrib": false