Skip to content

Commit 5568536

Browse files
authored
Merge pull request #27 from riker09/patch-updates
Updated dependencies
2 parents 8bebf6e + 71938bd commit 5568536

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
"license": "BSD-3-Clause",
55
"homepage": "https://github.com/andreaskoch/dockerized-magento",
66
"require": {
7-
"aoepeople/aoe_scheduler": "v0.4.3",
8-
"aschroder/smtp_pro": "v2.0.5",
9-
"gordonlesti/lesti_fpc": "1.3.6",
7+
"aoepeople/aoe_scheduler": "^1",
8+
"aschroder/smtp_pro": "^2",
9+
"gordonlesti/lesti_fpc": "^1",
1010
"jeroenvermeulen/solarium": "v1.6.9-beta",
1111
"aydin-hassan/magento-core-composer-installer": "*",
1212
"colinmollenhour/modman": "*",
1313
"theseer/autoload": "*",
14-
"magento/core": "1.9.2.4"
14+
"magento/core": "^1.9"
1515
},
1616
"require-dev": {
1717
"aoepeople/aoe_profiler": "v0.3.0",
18-
"aoepeople/aoe_templatehints": "v0.4.1",
19-
"avstudnitz/scopehint": "dev-master#9fd3eb0978fa67b55f5756494569746119f3f2f6",
18+
"aoepeople/aoe_templatehints": "^0.4",
19+
"avstudnitz/scopehint": "^0.6",
2020
"tim-reynolds/magento-qconfig": "1.0"
2121
},
2222
"repositories": [

docker-images/installer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ RUN apt-get update && \
3535
# Install magerun
3636
RUN curl -o magerun https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar && \
3737
chmod +x ./magerun && \
38+
./magerun selfupdate && \
3839
cp ./magerun /usr/local/bin/ && \
3940
rm ./magerun && \
4041
apt-get update && \

0 commit comments

Comments
 (0)