Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,20 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Version](http://semver.org/spec/v2.0.0.html).

## [version] - date
## [future-version] - 00-00-2018
### Added

### Changed

### Removed
### Removed

## [1.1] - 18-08-2018
### Changed

* Use `modestcoders/unison:2.51.2` image for unison container
* Update `markoshust/magento-php` images to PHP `7.1` using tag `7.1-fpm-3`

## [1.0.1] - 15-08-2018
### Changed

* Use `modestcoders/node-php:node8-php7.0` image for node container
42 changes: 0 additions & 42 deletions config/docker/image/unison/Dockerfile

This file was deleted.

96 changes: 0 additions & 96 deletions config/docker/image/unison/scripts/init_sync_config.sh

This file was deleted.

15 changes: 0 additions & 15 deletions config/docker/image/unison/scripts/sync.sh

This file was deleted.

15 changes: 0 additions & 15 deletions config/docker/image/unison/scripts/watch.sh

This file was deleted.

9 changes: 6 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ services:
- unison

phpfpm:
image: markoshust/magento-php:7.0-fpm-3
image: markoshust/magento-php:7.1-fpm-3
volumes: *appvolumes
environment:
PHP_IDE_CONFIG: serverName=localhost
depends_on:
- app-volumes
- db
- unison

db:
image: mysql:5.7
Expand All @@ -46,7 +47,7 @@ services:
- dbdata:/var/lib/mysql

unison:
build: ./config/docker/image/unison
image: modestcoders/unison:2.51.2
volumes:
- app-vendor:/var/www/html/vendor
- app-generated:/var/www/html/generated
Expand All @@ -56,10 +57,12 @@ services:
- SYNC_SOURCE_BASE_PATH=/sync
- SYNC_DESTINATION_BASE_PATH=/var/www/html
- SYNC_MAX_INOTIFY_WATCHES=60000
depends_on:
- app-volumes
privileged: true

node:
image: modestcoders/node-php:node8-php7.0
image: modestcoders/node-php:node8-php7.1
volumes: *appvolumes
environment:
- NPM_CONFIG_PREFIX=/home/node/.npm-global # To avoid permission error on npm install. It tries to save it at /var/www (root is the owner)
Expand Down