diff --git a/.circleci/config.yml b/.circleci/config.yml index c6a4198590..c1cadf6605 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,10 @@ version: 2.1 orbs: aws-ecr: circleci/aws-ecr@4.0.1 +executors: + docker_build: + machine: + docker_layer_caching: true jobs: build: working_directory: ~/alchemy-fr/Phraseanet @@ -109,8 +113,6 @@ workflows: oldfashion: jobs: - build - - newfashion: jobs: - aws-ecr/build_and_push_image: diff --git a/composer.json b/composer.json index eb0ab4b394..ad1d0d3489 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "php": ">=5.5.9", "ext-intl": "*", "alchemy-fr/tcpdf-clone": "~6.0", - "alchemy/embed-bundle": "^2.0.0", + "alchemy/embed-bundle": "^2.0.2", "alchemy/geonames-api-consumer": "~0.1.0", "alchemy/mediavorus": "^0.4.4", "alchemy/oauth2php": "1.1.0", @@ -123,7 +123,7 @@ "paragonie/random-lib": "^2.0" }, "require-dev": { - "mikey179/vfsStream": "~1.5", + "mikey179/vfsstream": "~1.5", "phpunit/phpunit": "^4.8|^5.0" }, "autoload": {