diff --git a/docs/contributing/upgrading-monorepo.md b/docs/contributing/upgrading-monorepo.md index 43d62b68ab7..7a385bd6eae 100644 --- a/docs/contributing/upgrading-monorepo.md +++ b/docs/contributing/upgrading-monorepo.md @@ -11,6 +11,8 @@ Typical upgrade sequence should be: - either rebuild your Docker images with `docker-compose up -d --build` or add `ELASTIC_SEARCH_INDEX_PREFIX=''` to your `.env` files in the microservice root directories, otherwise all requests to the microservices will throw `EnvNotFoundException` - [#679 webserver container starts after php-fpm is started](https://github.com/shopsys/shopsys/pull/679) - add `depends_on: [php-fpm]` into `webserver` service of your `docker-compose.yml` file so webserver will not fail on error `host not found in upstream php-fpm:9000` +- [#694 PHP 7.3 support](https://github.com/shopsys/shopsys/pull/694) + - rebuild your Docker images with `docker-compose up -d --build` ## [From 7.0.0-beta2 to v7.0.0-beta3](https://github.com/shopsys/shopsys/compare/v7.0.0-beta2...v7.0.0-beta3) - *(MacOS only)* [#503 updated docker-sync configuration](https://github.com/shopsys/shopsys/pull/503/) diff --git a/docs/installation/native-installation.md b/docs/installation/native-installation.md index f68f48a55e4..b7f8a60ca4c 100644 --- a/docs/installation/native-installation.md +++ b/docs/installation/native-installation.md @@ -16,7 +16,7 @@ First of all, you need to install the following software on your system: ### Linux / MacOS * [GIT](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) * [PostgreSQL 9.5](https://wiki.postgresql.org/wiki/Detailed_installation_guides) -* [PHP 7.1 - 7.2](http://php.net/manual/en/install.php) (configure your `php.ini` by [Required PHP Configuration](../introduction/required-php-configuration.md)) +* [PHP 7.1 - 7.3](http://php.net/manual/en/install.php) (configure your `php.ini` by [Required PHP Configuration](../introduction/required-php-configuration.md)) * [Composer](https://getcomposer.org/doc/00-intro.md#globally) * [Node.js with npm](https://nodejs.org/en/download/) (npm is automatically installed when you install Node.js) * [Redis](https://redis.io/topics/quickstart) @@ -25,7 +25,7 @@ First of all, you need to install the following software on your system: ### Windows * [GIT](https://git-scm.com/download/win) * [PostgreSQL 9.5](https://www.enterprisedb.com/downloads/postgres-postgresql-downloads#windows) -* [PHP 7.1 - 7.2](http://php.net/manual/en/install.windows.php) (configure your `php.ini` by [Required PHP Configuration](../introduction/required-php-configuration.md)) +* [PHP 7.1 - 7.3](http://php.net/manual/en/install.windows.php) (configure your `php.ini` by [Required PHP Configuration](../introduction/required-php-configuration.md)) * [Composer](https://getcomposer.org/doc/00-intro.md#installation-windows) * [Node.js with npm](https://nodejs.org/en/download/) (npm is automatically installed when you install Node.js) * [Redis](https://github.com/MicrosoftArchive/redis/releases) diff --git a/docs/introduction/shopsys-framework-on-docker.md b/docs/introduction/shopsys-framework-on-docker.md index 65b2afcee8c..8b904c51045 100644 --- a/docs/introduction/shopsys-framework-on-docker.md +++ b/docs/introduction/shopsys-framework-on-docker.md @@ -65,7 +65,7 @@ kind of recipe by which final image is cooked. Dockerfile example command: ```dockerfile -FROM php:7.2-fpm-alpine +FROM php:7.3-fpm-alpine ``` * The `FROM` instruction specifies the base image, from which you are building diff --git a/docs/upgrade/UPGRADE-unreleased.md b/docs/upgrade/UPGRADE-unreleased.md index b0671867acf..7f15683cbf7 100644 --- a/docs/upgrade/UPGRADE-unreleased.md +++ b/docs/upgrade/UPGRADE-unreleased.md @@ -13,6 +13,7 @@ There you can find links to upgrade notes for other versions too. - *(optional)* If you are using Kubernetes manifests for CI or deployment, follow changes done in manifests and ci `build_kubernetes.sh` script. - add `!docker/nginx` line into `.dockerignore` file so `docker/nginx` directory is not excluded during building `php-fpm` image ([#674](https://github.com/shopsys/shopsys/pull/674)) - make sure your `webserver` service depends on `php-fpm` in your `docker-compose.yml` file so webserver will not fail on error `host not found in upstream php-fpm:9000` ([#679](https://github.com/shopsys/shopsys/pull/679)) +- *(optional)* in your `docker/php-fpm/Dockerfile` change base image to `php:7.3-fpm-alpine` ([#694](https://github.com/shopsys/shopsys/pull/694)) ### Configuration - *(optional)* for easier deployment to production, make the trusted proxies in `Shopsys\Boostrap` class loaded from DIC parameter `trusted_proxies` instead of being hard-coded ([#596](https://github.com/shopsys/shopsys/pull/596)) diff --git a/microservices/product-search-export/.travis.yml b/microservices/product-search-export/.travis.yml index 080c42905de..827360068f5 100644 --- a/microservices/product-search-export/.travis.yml +++ b/microservices/product-search-export/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/microservices/product-search-export/docker/Dockerfile b/microservices/product-search-export/docker/Dockerfile index c29fc4fb632..8045369e9e9 100644 --- a/microservices/product-search-export/docker/Dockerfile +++ b/microservices/product-search-export/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm-alpine as base +FROM php:7.3-fpm-alpine as base # install nginx as in nginx:stable-alpine # https://hub.docker.com/r/library/nginx/tags/stable-alpine/ @@ -209,7 +209,7 @@ RUN composer global require hirak/prestissimo ######################################################################################################################## -FROM php:7.2-fpm-alpine as production-builder +FROM php:7.3-fpm-alpine as production-builder ENV APP_ENV prod diff --git a/microservices/product-search/docker/Dockerfile b/microservices/product-search/docker/Dockerfile index c29fc4fb632..8045369e9e9 100644 --- a/microservices/product-search/docker/Dockerfile +++ b/microservices/product-search/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm-alpine as base +FROM php:7.3-fpm-alpine as base # install nginx as in nginx:stable-alpine # https://hub.docker.com/r/library/nginx/tags/stable-alpine/ @@ -209,7 +209,7 @@ RUN composer global require hirak/prestissimo ######################################################################################################################## -FROM php:7.2-fpm-alpine as production-builder +FROM php:7.3-fpm-alpine as production-builder ENV APP_ENV prod diff --git a/packages/coding-standards/.travis.yml b/packages/coding-standards/.travis.yml index c80f73efca6..28968bd8da5 100644 --- a/packages/coding-standards/.travis.yml +++ b/packages/coding-standards/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/packages/form-types-bundle/.travis.yml b/packages/form-types-bundle/.travis.yml index ebe14cc6377..754caed1782 100644 --- a/packages/form-types-bundle/.travis.yml +++ b/packages/form-types-bundle/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 install: - composer install diff --git a/packages/framework/.travis.yml b/packages/framework/.travis.yml index b04aa95f8b9..c616c0a4c72 100644 --- a/packages/framework/.travis.yml +++ b/packages/framework/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/packages/http-smoke-testing/.travis.yml b/packages/http-smoke-testing/.travis.yml index 3e11a1945d9..d7a359d9c03 100644 --- a/packages/http-smoke-testing/.travis.yml +++ b/packages/http-smoke-testing/.travis.yml @@ -5,6 +5,7 @@ php: - 7.0 - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/packages/migrations/.travis.yml b/packages/migrations/.travis.yml index 2ba783dc863..7b1ddaf4764 100644 --- a/packages/migrations/.travis.yml +++ b/packages/migrations/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/packages/plugin-interface/.travis.yml b/packages/plugin-interface/.travis.yml index ebe14cc6377..754caed1782 100644 --- a/packages/plugin-interface/.travis.yml +++ b/packages/plugin-interface/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 install: - composer install diff --git a/packages/product-feed-google/.travis.yml b/packages/product-feed-google/.travis.yml index c7d117c1dac..418233eeafc 100644 --- a/packages/product-feed-google/.travis.yml +++ b/packages/product-feed-google/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/packages/product-feed-heureka-delivery/.travis.yml b/packages/product-feed-heureka-delivery/.travis.yml index 2768d838c0b..7bf02477837 100644 --- a/packages/product-feed-heureka-delivery/.travis.yml +++ b/packages/product-feed-heureka-delivery/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/packages/product-feed-heureka/.travis.yml b/packages/product-feed-heureka/.travis.yml index 2768d838c0b..7bf02477837 100644 --- a/packages/product-feed-heureka/.travis.yml +++ b/packages/product-feed-heureka/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/packages/product-feed-zbozi/.travis.yml b/packages/product-feed-zbozi/.travis.yml index 2768d838c0b..7bf02477837 100644 --- a/packages/product-feed-zbozi/.travis.yml +++ b/packages/product-feed-zbozi/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 7.1 - 7.2 + - 7.3 cache: directories: diff --git a/project-base/docker/php-fpm/Dockerfile b/project-base/docker/php-fpm/Dockerfile index 545ff3c0370..0dbcd1f948c 100644 --- a/project-base/docker/php-fpm/Dockerfile +++ b/project-base/docker/php-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm-alpine as base +FROM php:7.3-fpm-alpine as base ARG project_root=. ENV REDIS_PREFIX=''