Skip to content

Commit

Permalink
Updated PHP to version 7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
grossmannmartin committed Jan 23, 2019
1 parent 55e785d commit 33a29d8
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 10 deletions.
4 changes: 3 additions & 1 deletion docs/contributing/upgrading-monorepo.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Typical upgrade sequence should be:
* if you're experiencing some errors, you can always rebuild application and load demo data with `php phing build-demo-dev`

## [From v7.0.0-beta5 to Unreleased]
- [#694 PHP 7.3 support](https://github.com/shopsys/shopsys/pull/694)
- rebuild your Docker images with `docker-compose up -d --build`

## [From v7.0.0-beta4 to v7.0.0-beta5]
- [#651 It's possible to add index prefix to elastic search](https://github.com/shopsys/shopsys/pull/651)
Expand Down Expand Up @@ -75,4 +77,4 @@ Typical upgrade sequence should be:
[From v7.0.0-beta5 to Unreleased]: https://github.com/shopsys/shopsys/compare/v7.0.0-beta5...HEAD
[From v7.0.0-beta4 to v7.0.0-beta5]: https://github.com/shopsys/shopsys/compare/v7.0.0-beta4...v7.0.0-beta5
[From v7.0.0-beta2 to v7.0.0-beta3]: https://github.com/shopsys/shopsys/compare/v7.0.0-beta2...v7.0.0-beta3
[From v7.0.0-alpha5 to v7.0.0-alpha6]: https://github.com/shopsys/shopsys/compare/v7.0.0-alpha5...v7.0.0-alpha6
[From v7.0.0-alpha5 to v7.0.0-alpha6]: https://github.com/shopsys/shopsys/compare/v7.0.0-alpha5...v7.0.0-alpha6
4 changes: 2 additions & 2 deletions docs/installation/native-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions docs/introduction/shopsys-framework-on-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ kind of recipe by which final image is cooked.

Dockerfile example command:
```dockerfile
FROM php:7.2-fpm-stretch
FROM php:7.3-fpm-stretch
```
* The `FROM` instruction specifies the base image, from which you are building

Expand Down Expand Up @@ -111,4 +111,4 @@ Those images are only used as it is, we are not extending them and we are only u
Microservices should be small as possible, even we are extending php-fpm images used for them, we take advantage of small size and suppose that users of these images will not extend them and more likely will be implementing their own microservices.

##### Application PHP-FPM
In this case, we use Debian mainly because we suppose users to modify these images often(adding php-extensions, implementing connections to Databases). As Debian is much more easier to modify, we decided that it will be best for new users to start on Debian, and if they care about size, they can always rewrite their Dockerfiles to be use alpine image if needed. Also many of clients using Shopsys Framework often connects to MSSQL databases and we want to make it easy for them.
In this case, we use Debian mainly because we suppose users to modify these images often(adding php-extensions, implementing connections to Databases). As Debian is much more easier to modify, we decided that it will be best for new users to start on Debian, and if they care about size, they can always rewrite their Dockerfiles to be use alpine image if needed. Also many of clients using Shopsys Framework often connects to MSSQL databases and we want to make it easy for them.
5 changes: 5 additions & 0 deletions docs/upgrade/UPGRADE-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ This guide contains instructions to upgrade from version v7.0.0-beta5 to Unrelea
**Before you start, don't forget to take a look at [general instructions](/UPGRADE.md) about upgrading.**
There you can find links to upgrade notes for other versions too.

## [shopsys/framework]
### Infrastructure
- *(optional)* in your `docker/php-fpm/Dockerfile` change base image to `php:7.3-fpm-stretch` ([#694](https://github.com/shopsys/shopsys/pull/694))

[Upgrade from v7.0.0-beta5 to Unreleased]: https://github.com/shopsys/shopsys/compare/v7.0.0-beta5...HEAD
[shopsys/framework]: https://github.com/shopsys/framework
1 change: 1 addition & 0 deletions microservices/product-search-export/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
4 changes: 2 additions & 2 deletions microservices/product-search-export/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions microservices/product-search/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions packages/coding-standards/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
1 change: 1 addition & 0 deletions packages/form-types-bundle/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

install:
- composer install
Expand Down
1 change: 1 addition & 0 deletions packages/framework/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
1 change: 1 addition & 0 deletions packages/http-smoke-testing/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ php:
- 7.0
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
1 change: 1 addition & 0 deletions packages/migrations/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
1 change: 1 addition & 0 deletions packages/plugin-interface/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

install:
- composer install
Expand Down
1 change: 1 addition & 0 deletions packages/product-feed-google/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
1 change: 1 addition & 0 deletions packages/product-feed-heureka-delivery/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
1 change: 1 addition & 0 deletions packages/product-feed-heureka/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
1 change: 1 addition & 0 deletions packages/product-feed-zbozi/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: php
php:
- 7.1
- 7.2
- 7.3

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion project-base/docker/php-fpm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.2-fpm-stretch as base
FROM php:7.3-fpm-stretch as base

ARG project_root=.
ENV REDIS_PREFIX=''
Expand Down

0 comments on commit 33a29d8

Please sign in to comment.