Skip to content

Commit fc0821d

Browse files
committed
Rplaced "Vagrant" with "Devbox" across project
1 parent 00ef907 commit fc0821d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+551
-668
lines changed

Diff for: .gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/.vagrant
1+
/.devbox
22
/.idea
33
/.composer
44
/log/*.log

Diff for: CHANGELOG.md

-117
Original file line numberDiff line numberDiff line change
@@ -4,128 +4,11 @@ All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55

66
* [\[Unreleased\]](#unreleased)
7-
* [\[v2.2.0\] - 2017-02-25](#v220---2017-02-25)
8-
* [\[v2.1.0\] - 2016-06-22](#v210---2016-06-22)
9-
* [\[v2.0.0\] - 2016-02-05](#v200---2016-02-05)
10-
* [\[v1.0.0\] - 2016-01-11](#v100---2016-01-11)
117

128
## [Unreleased]
139

1410
### Changed
1511

16-
- Verified compatibility with Vagrant 2.x and loosened Vagrant version requirement
17-
- Config option 'php_version' should now be used for PHP version selection instead of 'use_php7'
18-
- Upgraded Varnish to v4.1
19-
- Improved Magento re-installation speed by avoiding unnecessary cache cleaning
20-
- Custom code sniffer rules replaced with PSR2
21-
- MessageQueue module will now be installed with CE if using Magento v2.3+
22-
2312
### Added
2413

25-
- PHP 7.1 and PHP 7.2 support
26-
- Support for new location of `generated` directory in Magento 2.2.0
27-
- Basic data generation can be turned off. Added configurable product and customer address generation
28-
- Documentation in config.yaml.dist for choosing specific composer package versions
29-
30-
### Fixed
31-
32-
- Magento 2.2.0 EE installation from composer
33-
34-
## [v2.2.0] - 2017-02-25
35-
36-
### Changed
37-
38-
- Magento EE and sample data directories are added to 'Exclude list' in PhpStorm
39-
- Redis is used as default cache backend instead of filesystem
40-
- After EE is linked, EE versions of composer.lock and composer.json are replaced back with CE versions (thus are not marked by git as modified)
41-
- Improved CLI scripts output formatting
42-
43-
### Fixed
44-
45-
- Issue with some files marked as unversioned in git after EE linking
46-
- It is now possible to use spaces in path to vagrant project on Windows. On OSX and Linux hosts it works in non-NFS mode, in NFS mode it does not work because of [bug in vagrant](mitchellh/vagrant#7540)
47-
- Issue with MySQL being down after VM power off
48-
49-
### Added
50-
51-
- Added ability to configure number of CPUs for virtual machine via [etc/config.yaml](etc/config.yaml.dist)
52-
- Added generation of basic sample data for testing purposes
53-
- Ability to upgrade Magento using `m-switch-to-ce` and `m-switch-to-ee` (when `-u` flag is specified)
54-
- Redis support for Magento caching
55-
- Access to Magento developer mode and storefront/admin UI debugging features via [etc/config.yaml](etc/config.yaml.dist)
56-
- Composer-based installation support
57-
- Magento cache warming up after re-install and clearing cache (when `-w` flag is specified)
58-
- Tests configuration files are generated during project initialization
59-
- Sample data support
60-
- ElasticSearch support
61-
- NodeJS, NPM, Gulp and Grunt are installed as part of the provisioning process
62-
63-
## [v2.1.0] - 2016-06-22
64-
65-
### Changed
66-
67-
- Removed requirement for public github token due to Composer limitations (issue is fixed on Composer side)
68-
- Changed requirement for minimum box version from 1.0 to 1.1
69-
- Upgraded PHP 5.5.9 to PHP 5.6
70-
- When [init_project.sh](init_project.sh) is executed, EE will be installed by default, if EE repository is specified in [etc/config.yaml](etc/config.yaml.dist). Not supported on Windows hosts
71-
7214
### Fixed
73-
74-
- Permissions during Magento installation on Windows hosts
75-
- Issue with Magento compiler on Windows hosts
76-
- "stdin: is not a tty" warning
77-
78-
### Added
79-
80-
- Setup and upgrade cron scripts to crontab
81-
- Logging of all emails in HTML format to `vagrant-magento/log/email`
82-
- Host wrapper script for bin/magento command on guest
83-
- Ability to modify guest config files (PHP, Apache etc) directly from host IDE
84-
- Ability to choose if PhpStorm configs should be removed during project reinitialization
85-
- Ability to switch PHP version without destroying the project ("vagrant reload" is required)
86-
- Ability to do force switch to CE or EE (even if already switched to target edition)
87-
- Ability to use Varnish full page caching automatically. (Using "vagrant reload" or m-varnish script)
88-
89-
## [v2.0.0] - 2016-02-05
90-
91-
### Changed
92-
93-
- Moved provisioning scripts
94-
- Magento project directory moved to vagrant project root. Current structure is as follows: `vagrant-magento/magento2ce/magento2ee`
95-
- PHP 7.0 is installed by default instead of PHP 5.5.9 (can be configured in [etc/config.yaml](etc/config.yaml.dist))
96-
- Renamed configuration folder from `local.config` to `etc`
97-
- Set minimum Vagrant version as 1.8
98-
- Improved deployment speed in case of disabled NFS for folders sync
99-
- Used custom Vagrant box with pre-installed software necessary for Magento 2 development
100-
- Eliminated explicit dependency on PHP for Windows hosts (it can be downloaded and used locally for the project)
101-
- XSD URN generation is executed after Magento installation
102-
103-
### Added
104-
105-
- Added [project initialization script](init_project.sh) and host scripts for routine flows (compatible with OSX, *nix and Windows)
106-
- Implemented static value of forwarded SSH port to prevent necessity to reconfigure software accessing guest via SSH
107-
- Implemented collision prevention for IP address and host name (in case when several machines are created at once)
108-
- Configuration file [etc/config.yaml](etc/config.yaml.dist)
109-
- PHP 7.0 support
110-
- PHP Storm configuration during project initialization (particularly automatic deployment settings)
111-
- Automatic vagrant plugins installation
112-
113-
## [v1.0.0] - 2016-01-11
114-
115-
### Added
116-
117-
- Integrated vagrant host manager plugin to allow automatic /etc/hosts update
118-
- Support of EE linked to CE using symlinks on *nix hosts
119-
- ${MAGENTO_ROOT} environment variable, which stores installation path on the guest
120-
- Support of Rabbit MQ
121-
- Possibility to specify tokens for repo.magento.com composer repository
122-
- git is now installed on guest machine
123-
- Removed 'magento' MySQL user, password of 'root' user removed
124-
- Database for integration tests are created by default
125-
- Added script for clearing Magento cache from host command line
126-
- Configured XDebug to allow remote debugging
127-
- Fixed max_nesting_level issue with XDebug enabled
128-
- Apache is run by 'vagrant' user
129-
- Enabled Magento cron jobs
130-
- Enabled XDebug by default
131-
- Created vagrant configuration for Magneto 2 CE developer's environment installation

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Everyone is welcome to contribute improvements and fixes to this project. There are no specific requirements, just create a pull request with proposed modifications and try to run [tests](https://github.com/paliarush/magento2-vagrant-for-developers-tests) on your local environment.
1+
Everyone is welcome to contribute improvements and fixes to this project. There are no specific requirements, just create a pull request with proposed modifications and try to run [tests](https://github.com/paliarush/magento2-devbox-for-developers-tests) on your local environment.

Diff for: README.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Build Status](https://travis-ci.com/magento/magento2-kubernetes-devbox.svg?branch=master)](https://travis-ci.com/magento/magento2-kubernetes-devbox)
44
<!--[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)-->
55
[![Semver](http://img.shields.io/SemVer/2.0.0.png?color=blue)](http://semver.org/spec/v2.0.0.html)
6-
<!--[![Latest GitHub release](docs/images/release_badge.png)](https://github.com/paliarush/magento2-vagrant-for-developers/releases/latest)-->
6+
<!--[![Latest GitHub release](docs/images/release_badge.png)](https://github.com/paliarush/magento2-devbox-for-developers/releases/latest)-->
77

88
* [What You get](#what-you-get)
99
* [How to install](#how-to-install)
@@ -68,7 +68,7 @@ The software listed below should be available in [PATH](https://en.wikipedia.org
6868
- [Helm](https://docs.helm.sh/using_helm/#installing-helm)
6969
- [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
7070
- [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) - Ensure that SSH keys are generated and associated with your Github account. See [how to check](https://help.github.com/articles/testing-your-ssh-connection/) and [how to configure](https://help.github.com/articles/generating-ssh-keys/), if not configured.<br />
71-
:information_source: To obtain the codebase without cloning, just use the Magento 2 codebase instead of `vagrant-magento/magento2ce`. Either method will produce a successful installation.<br />
71+
:information_source: To obtain the codebase without cloning, just use the Magento 2 codebase instead of `devbox-magento/magento2ce`. Either method will produce a successful installation.<br />
7272

7373
<!-- :information_source: On Windows hosts ![](docs/images/windows-icon.png) Git must be [v2.7+](http://git-scm.com/download/win). Also make sure to set the following options to avoid issues with incorrect line separators:
7474
@@ -163,7 +163,7 @@ Upon a successful installation, you'll see the location and URL of the newly-ins
163163
164164
### Getting updates and fixes
165165
166-
Current vagrant project follows [semantic versioning](http://semver.org/spec/v2.0.0.html) so feel free to pull the latest features and fixes, they will not break your project.
166+
Current devbox project follows [semantic versioning](http://semver.org/spec/v2.0.0.html) so feel free to pull the latest features and fixes, they will not break your project.
167167
For example your current branch is `2.0`, then it will be safe to pull any changes from `origin/2.0`. However branch `3.0` will contain changes backward incompatible with `2.0`.
168168
Note, that semantic versioning is only used for `x.0` branches (not for `develop` or `master`).
169169
@@ -320,7 +320,7 @@ bash m-composer update
320320
### Running Magento tests
321321

322322
Not available yet.
323-
<!--See [draft](https://github.com/paliarush/magento2-vagrant-for-developers/issues/120)-->
323+
<!--See [draft](https://github.com/paliarush/magento2-devbox-for-developers/issues/120)-->
324324

325325

326326
## Environment configuration
@@ -329,7 +329,7 @@ Not available yet.
329329

330330
Not available yet.
331331
<!--Switch between PHP versions using "php_version: <version>" option in [config.yaml](etc/config.yaml.dist). Supported versions are 5.6, 7.0, 7.1 and 7.2.
332-
PHP version will be applied after "vagrant reload".
332+
PHP version will be applied after "devbox reload".
333333
-->
334334

335335
### Activating Varnish
@@ -396,29 +396,29 @@ Note: See [Working with npm](https://www.npmjs.com/package/n#working-with-npm) i
396396
-->
397397
### FAQ
398398
<!--
399-
1. To debug any CLI script in current Vagrant project, set `debug:vagrant_project` option in [config.yaml](etc/config.yaml.dist) to `1`
400-
1. Is Windows 10 supported? Yes, but you may face the same issue as described [here](https://github.com/paliarush/magento2-vagrant-for-developers/issues/36) or [here](https://github.com/paliarush/magento2-vagrant-for-developers/issues/173). Also Virtual box may not work on Windows 10 in headless mode, see how to [enable GUI mode](https://www.vagrantup.com/docs/virtualbox/configuration.html)
401-
1. ![](docs/images/linux-icon.png)![](docs/images/osx-icon.png) On OSX and \*nix hosts NFS will be used by default to sync your project files with guest. On some hosts Vagrant cannot configure NFS properly, in this case it is possible to deploy project without NFS by setting `use_nfs` option in [config.yaml](etc/config.yaml.dist) to `0` <br />
399+
1. To debug any CLI script in current Devbox project, set `debug:devbox_project` option in [config.yaml](etc/config.yaml.dist) to `1`
400+
1. Is Windows 10 supported? Yes, but you may face the same issue as described [here](https://github.com/paliarush/magento2-devbox-for-developers/issues/36) or [here](https://github.com/paliarush/magento2-devbox-for-developers/issues/173). Also Virtual box may not work on Windows 10 in headless mode, see how to [enable GUI mode](https://www.devboxup.com/docs/virtualbox/configuration.html)
401+
1. ![](docs/images/linux-icon.png)![](docs/images/osx-icon.png) On OSX and \*nix hosts NFS will be used by default to sync your project files with guest. On some hosts Devbox cannot configure NFS properly, in this case it is possible to deploy project without NFS by setting `use_nfs` option in [config.yaml](etc/config.yaml.dist) to `0` <br />
402402
1. ![](docs/images/windows-icon.png) On Windows hosts you might face `Composer Install Error: ZipArchive::extractTo(): Full extraction path exceed MAXPATHLEN (260)` exception during `composer install`. This can be fixed in 2 ways: decrease path length to the project directory or set `composer_prefer_source` option in [config.yaml](etc/config.yaml.dist) to `1`
403403
1. Make sure that you used `magento2-devbox` directory as project root in PHP Storm (not `magento2-devbox/magento`)
404404
1. If project opened in PhpStorm looks broken, close PhpStorm and remove `magento2-devbox/.idea`. Run `bash magento2-devbox/scripts/host/configure_php_storm.sh`. After opening project in PhpStorm again everything should look good
405405
1. If code is not synchronized properly on Windows hosts (or when NFS mode is disabled in [config.yaml](etc/config.yaml.dist) explicitly), make sure that PhpStorm is running before making any changes in the code. This is important because otherwise PhpStorm will not be able to detect changes and upload them to the guest machine
406406
1. Please make sure that currently installed software, specified in [requirements section](#requirements), meets minimum version requirement
407-
1. Be careful if your OS is case-insensitive, NFS might break the symlinks if you cd into the wrong casing and you power the vagrant up. Just be sure to cd in to the casing the directory was originally created as.
408-
1. Cannot run unit tests from PHPStorm on Magento 2.2, see possible solution [here](https://github.com/paliarush/magento2-vagrant-for-developers/issues/167)
409-
1. [Permission denied (publickey)](https://github.com/paliarush/magento2-vagrant-for-developers/issues/165)
410-
1. If during a vagrant reload, the following message appears:
407+
1. Be careful if your OS is case-insensitive, NFS might break the symlinks if you cd into the wrong casing and you power the devbox up. Just be sure to cd in to the casing the directory was originally created as.
408+
1. Cannot run unit tests from PHPStorm on Magento 2.2, see possible solution [here](https://github.com/paliarush/magento2-devbox-for-developers/issues/167)
409+
1. [Permission denied (publickey)](https://github.com/paliarush/magento2-devbox-for-developers/issues/165)
410+
1. If during a devbox reload, the following message appears:
411411
412412
>There was a problem while downloading the metadata for your box
413413
to check for updates. This is not an error, since it is usually due
414414
to temporary network problems. This is just a warning. The problem
415415
encountered was:
416416
The requested URL returned error: 404 Not Found
417417
418-
It is likely that your vagrant cli is caching an old url. Perform the following cli commands:
418+
It is likely that your devbox cli is caching an old url. Perform the following cli commands:
419419
420420
```bash
421-
sed -i -- 's/atlas.hashicorp/vagrantcloud/g' ~/.vagrant.d/boxes/{name of your paliarush/ubuntu image}/metadata_url
422-
mv ~/.vagrant.d/boxes/{name of your paliarush/ubuntu image}/metadata_url2 ~/.vagrant.d/boxes/{name of your paliarush/ubuntu image}/metadata_url
421+
sed -i -- 's/atlas.hashicorp/devboxcloud/g' ~/.devbox.d/boxes/{name of your paliarush/ubuntu image}/metadata_url
422+
mv ~/.devbox.d/boxes/{name of your paliarush/ubuntu image}/metadata_url2 ~/.devbox.d/boxes/{name of your paliarush/ubuntu image}/metadata_url
423423
```
424424
-->

Diff for: etc/config.yaml.dist

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ guest:
2828
use_nfs: 1
2929
# [To apply changes: init_project.sh -f] The placeholder IP will be replaced with auto-detected value, unless modified manually before execution of "init_project.sh" script.
3030
nfs_server_ip: "0.0.0.0"
31-
# [To apply changes: vagrant reload] Default is 2Gb, around 3Gb is necessary to run functional tests.
31+
# [To apply changes: devbox reload] Default is 2Gb, around 3Gb is necessary to run functional tests.
3232
memory: 2048
3333
# Recommended number of CPUs is 2
3434
cpus: 1
3535
ip_address: "192.168.10.2"
3636
forwarded_ssh_port: 3000
3737

3838
environment:
39-
# [To apply changes: vagrant reload] Valid versions: 5.6, 7.0, 7.1, 7.2
39+
# [To apply changes: devbox reload] Valid versions: 5.6, 7.0, 7.1, 7.2
4040
php_version: "7.0"
4141
composer_prefer_source: 0
4242
# [To apply changes: m-reinstall OR m-varnish enable/disable]
@@ -50,7 +50,7 @@ magento:
5050
# [To apply changes: m-switch-to-ce -f OR m-switch-to-ee -f] Generate customer ([email protected]:123123qQ), category, simple product, configurable product after successful Magento installation
5151
generate_basic_data: 1
5252
# [To apply changes: init_project.sh -f]
53-
host_name: "magento2.vagrant2"
53+
host_name: "magento2.devbox2"
5454
# [To apply changes: m-reinstall]
5555
admin_frontname: "admin"
5656
language: "en_US"
@@ -66,5 +66,5 @@ debug:
6666
magento_storefront: 0
6767
# [Changes applied on m-clear-cache] Enable template path hints in the admin panel
6868
magento_admin: 0
69-
# [Changes applied immediately] Enable detailed output from all scripts provided by current vagrant project
70-
vagrant_project: 0
69+
# [Changes applied immediately] Enable detailed output from all scripts provided by current devbox project
70+
devbox_project: 0

Diff for: etc/helm/templates/cron.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
{{/*- name: code*/}}
2222
{{/*mountPath: {{.Values.global.monolith.volumeHostPath}}*/}}
2323
{{/*env:*/}}
24-
{{/*- name: VAGRANT_ROOT*/}}
24+
{{/*- name: DEVBOX_ROOT*/}}
2525
{{/*value: {{.Values.global.monolith.volumeHostPath}}*/}}
2626
{{/*- name: COMPOSER_HOME*/}}
2727
{{/*value: {{.Values.global.monolith.volumeHostPath}}/.composer*/}}
2828
{{/*- name: MAGENTO_ROOT*/}}
2929
{{/*value: {{.Values.global.monolith.volumeHostPath}}/magento*/}}
3030
{{/*- name: MAGENTO_ROOT_HOST*/}}
3131
{{/*value: {{.Values.global.monolith.volumeHostPath}}/magento*/}}
32-
{{/*- name: VAGRANT_ROOT_HOST*/}}
32+
{{/*- name: DEVBOX_ROOT_HOST*/}}
3333
{{/*value: {{.Values.global.monolith.volumeHostPath}}*/}}
3434
{{/*- name: IS_WINDOWS_HOST*/}}
3535
{{/*value: "0"*/}}
@@ -66,15 +66,15 @@
6666
{{/*- name: code*/}}
6767
{{/*mountPath: {{.Values.global.monolith.volumeHostPath}}*/}}
6868
{{/*env:*/}}
69-
{{/*- name: VAGRANT_ROOT*/}}
69+
{{/*- name: DEVBOX_ROOT*/}}
7070
{{/*value: {{.Values.global.monolith.volumeHostPath}}*/}}
7171
{{/*- name: COMPOSER_HOME*/}}
7272
{{/*value: {{.Values.global.monolith.volumeHostPath}}/.composer*/}}
7373
{{/*- name: MAGENTO_ROOT*/}}
7474
{{/*value: {{.Values.global.monolith.volumeHostPath}}/magento*/}}
7575
{{/*- name: MAGENTO_ROOT_HOST*/}}
7676
{{/*value: {{.Values.global.monolith.volumeHostPath}}/magento*/}}
77-
{{/*- name: VAGRANT_ROOT_HOST*/}}
77+
{{/*- name: DEVBOX_ROOT_HOST*/}}
7878
{{/*value: {{.Values.global.monolith.volumeHostPath}}*/}}
7979
{{/*- name: IS_WINDOWS_HOST*/}}
8080
{{/*value: "0"*/}}
@@ -112,15 +112,15 @@
112112
{{/*- name: code*/}}
113113
{{/*mountPath: {{.Values.global.monolith.volumeHostPath}}*/}}
114114
{{/*env:*/}}
115-
{{/*- name: VAGRANT_ROOT*/}}
115+
{{/*- name: DEVBOX_ROOT*/}}
116116
{{/*value: {{.Values.global.monolith.volumeHostPath}}*/}}
117117
{{/*- name: COMPOSER_HOME*/}}
118118
{{/*value: {{.Values.global.monolith.volumeHostPath}}/.composer*/}}
119119
{{/*- name: MAGENTO_ROOT*/}}
120120
{{/*value: {{.Values.global.monolith.volumeHostPath}}/magento*/}}
121121
{{/*- name: MAGENTO_ROOT_HOST*/}}
122122
{{/*value: {{.Values.global.monolith.volumeHostPath}}/magento*/}}
123-
{{/*- name: VAGRANT_ROOT_HOST*/}}
123+
{{/*- name: DEVBOX_ROOT_HOST*/}}
124124
{{/*value: {{.Values.global.monolith.volumeHostPath}}*/}}
125125
{{/*- name: IS_WINDOWS_HOST*/}}
126126
{{/*value: "0"*/}}

0 commit comments

Comments
 (0)