Skip to content

Commit 1409e54

Browse files
author
Alexander Paliarush
committed
- Changed requirements for minimum box version from 1.0 to 1.1
- Fixed issue with Magento compiler on Windows hosts
1 parent 3e260f7 commit 1409e54

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
1212
### Changed
1313

1414
- Removed requirement for public github token due to Composer limitations (issue is fixed on Composer side)
15+
- Changed requirement for minimum box version from 1.0 to 1.1
1516

1617
### Fixed
1718

1819
- Fixed permissions during Magento installation on Windows hosts
20+
- Fixed issue with Magento compiler on Windows hosts
1921

2022
### Added
2123

Vagrantfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ host_magento_dir = Dir.pwd + '/magento2ce'
3939
VAGRANT_API_VERSION = 2
4040
Vagrant.configure(VAGRANT_API_VERSION) do |config|
4141
config.vm.box = "paliarush/magento2.ubuntu"
42-
config.vm.box_version = "~> 1.0"
42+
config.vm.box_version = "~> 1.1"
4343

4444
config.vm.provider "virtualbox" do |vb|
4545
vb.memory = guest_memory
@@ -54,7 +54,7 @@ Vagrant.configure(VAGRANT_API_VERSION) do |config|
5454
config.vm.synced_folder host_magento_dir, guest_magento_dir, type: "nfs", create: true
5555
else
5656
guest_magento_dir = '/var/www/magento2ce'
57-
config.vm.synced_folder host_magento_dir + '/var/generation', guest_magento_dir + '/var/generation', create: true
57+
config.vm.synced_folder host_magento_dir + '/var', guest_magento_dir + '/var', create: true
5858
config.vm.synced_folder host_magento_dir + '/app/etc', guest_magento_dir + '/app/etc', create: true
5959
end
6060

docs/phpstorm-configuration-windows-hosts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ This solution is applicable to any Vagrant configuration for Magento instance, s
77

88
```
99
Vagrant.configure(2) do |config|
10-
config.vm.synced_folder '../magento2ce/var/generation', '/var/www/magento2ce/var/generation'
10+
config.vm.synced_folder '../magento2ce/var', '/var/www/magento2ce/var'
1111
config.vm.synced_folder '../magento2ce/app/etc', '/var/www/magento2ce/app/etc'
1212
end
1313
```

scripts/host/php-storm-configs/deployment.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</mappings>
1010
<excludedPaths>
1111
<excludedPath local="true" path="$PROJECT_DIR$/magento2ce/app/etc" />
12-
<excludedPath local="true" path="$PROJECT_DIR$/magento2ce/var/generation" />
12+
<excludedPath local="true" path="$PROJECT_DIR$/magento2ce/var" />
1313
</excludedPaths>
1414
</serverdata>
1515
</paths>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
#!/usr/bin/env bash
22

3+
# Enable trace printing and exit on the first error
4+
set +x
5+
36
link_configs
47

58
# Make sure configs are restored on system halt and during reboot
69
if [ ! -f /etc/init.d/K04-unlink-configs ]; then
710
ln -s /vagrant/scripts/guest/unlink_configs /etc/init.d/K04-unlink-configs
811
ln -s /etc/init.d/K04-unlink-configs /etc/rc0.d/K04-unlink-configs
912
ln -s /etc/init.d/K04-unlink-configs /etc/rc6.d/K04-unlink-configs
13+
fi
14+
15+
# Upgrade existing environment
16+
if [ -f /vagrant/.idea/deployment.xml ]; then
17+
sed -i.back "s|magento2ce/var/generation|magento2ce/var|g" "/vagrant/.idea/deployment.xml"
1018
fi

0 commit comments

Comments
 (0)