Skip to content

Commit 185b574

Browse files
authored
Merge pull request #2 from ModestCoders/update-images
Update images
2 parents d45bb54 + 8b1980f commit 185b574

File tree

6 files changed

+19
-173
lines changed

6 files changed

+19
-173
lines changed

CHANGELOG.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,20 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Version](http://semver.org/spec/v2.0.0.html).
66

7-
## [version] - date
7+
## [future-version] - 00-00-2018
88
### Added
99

1010
### Changed
1111

12-
### Removed
12+
### Removed
13+
14+
## [1.1] - 18-08-2018
15+
### Changed
16+
17+
* Use `modestcoders/unison:2.51.2` image for unison container
18+
* Update `markoshust/magento-php` images to PHP `7.1` using tag `7.1-fpm-3`
19+
20+
## [1.0.1] - 15-08-2018
21+
### Changed
22+
23+
* Use `modestcoders/node-php:node8-php7.0` image for node container

config/docker/image/unison/Dockerfile

Lines changed: 0 additions & 42 deletions
This file was deleted.

config/docker/image/unison/scripts/init_sync_config.sh

Lines changed: 0 additions & 96 deletions
This file was deleted.

config/docker/image/unison/scripts/sync.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

config/docker/image/unison/scripts/watch.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

docker-compose.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ services:
2525
- unison
2626

2727
phpfpm:
28-
image: markoshust/magento-php:7.0-fpm-3
28+
image: markoshust/magento-php:7.1-fpm-3
2929
volumes: *appvolumes
3030
environment:
3131
PHP_IDE_CONFIG: serverName=localhost
3232
depends_on:
3333
- app-volumes
3434
- db
35+
- unison
3536

3637
db:
3738
image: mysql:5.7
@@ -46,7 +47,7 @@ services:
4647
- dbdata:/var/lib/mysql
4748

4849
unison:
49-
build: ./config/docker/image/unison
50+
image: modestcoders/unison:2.51.2
5051
volumes:
5152
- app-vendor:/var/www/html/vendor
5253
- app-generated:/var/www/html/generated
@@ -56,10 +57,12 @@ services:
5657
- SYNC_SOURCE_BASE_PATH=/sync
5758
- SYNC_DESTINATION_BASE_PATH=/var/www/html
5859
- SYNC_MAX_INOTIFY_WATCHES=60000
60+
depends_on:
61+
- app-volumes
5962
privileged: true
6063

6164
node:
62-
image: modestcoders/node-php:node8-php7.0
65+
image: modestcoders/node-php:node8-php7.1
6366
volumes: *appvolumes
6467
environment:
6568
- 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)

0 commit comments

Comments
 (0)