Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
131b426
magento/devdocs#: Editing. Add bash syntax to command line
atwixfirster Apr 17, 2019
a2e058e
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
cc7f5ad
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
48db08f
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
7c65dae
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
8684ef7
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
70d75b1
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
90663b3
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
5e825b2
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
90ca93a
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
b06b24e
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
10c19c1
magento/devdocs#: Format Bash
atwixfirster Apr 19, 2019
3f7042d
Fixed formatting.
dobooth Apr 22, 2019
beab5b9
Fixed command.
dobooth Apr 22, 2019
ca42566
Formatting.
dobooth Apr 22, 2019
7c631c9
Updated commands.
dobooth Apr 22, 2019
873a752
Fixed commands.
dobooth Apr 22, 2019
6ccbaaf
Fixed highlighter.
dobooth Apr 22, 2019
fb0e532
Fixed command.
dobooth Apr 22, 2019
5df7a6d
Removed tabs.
dobooth Apr 22, 2019
9a03c49
Fixed code blocks.
dobooth Apr 22, 2019
c8e4bcd
Formatting.
dobooth Apr 22, 2019
25a0964
Fixed code block.
dobooth Apr 22, 2019
57b9eef
magento/devdocs#: Format Bash
atwixfirster May 2, 2019
d33d578
Merge branch 'format-bash' of https://github.com/atwixfirster/devdocs…
atwixfirster May 2, 2019
5d2008b
Merge branch 'master' into format-bash
dobooth May 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion guides/v2.1/cloud/before/before-setup-env-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ After you have installed Magento, you need to set the file system permissions an
1. Enter the following commands in the order shown:

```bash
cd <your Magento install dir>
cd <magento_root>
```

```terminal
Expand Down Expand Up @@ -194,7 +194,9 @@ To verify the local, access the store using the URL you passed in the install co

To change the URI for the Admin panel, use this command to locate it:

```bash
php bin/magento info:adminuri
```

To verify the Integration master branch environment, log into the Project Web Interface and select your named project. In the list of branches, select the Master. Click Access site to pull up a list of URLs (HTTP and HTTPS) and click the preferred link to open the site. To view the admin, add /admin or other configured Admin URI.

Expand Down
3 changes: 3 additions & 0 deletions guides/v2.1/cloud/cdn/cloud-vcl-custom-snippets.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ The following walk-through shows you how to create regular VCL snippet files and
```bash
export FASTLY_SERVICE_ID=<Service ID>
```

```bash
export FASTLY_API_TOKEN=<API Token>
```
Expand Down Expand Up @@ -172,13 +173,15 @@ Save the active version number in a bash environment variable for use in subsequ
```bash
export FASTLY_VERSION_ACTIVE=<Version>
```

#### Step 2: Clone the active VCL version and all snippets {#clone}

Before you can add or modify custom VCL snippets, you must create a copy of the active VCL version for editing. Use the Fastly API [clone ](https://docs.fastly.com/api/config#version_7f4937d0663a27fbb765820d4c76c709) operation:

```bash
curl -H "Fastly-Key: $FASTLY_API_TOKEN" https://api.fastly.com/service/$FASTLY_SERVICE_ID/version/$FASTLY_VERSION_ACTIVE/clone -X PUT
```

In the JSON response, the version number is incremented, and the *active* key value is `false`. You can modify the new, inactive VCL version locally.

```json
Expand Down
23 changes: 15 additions & 8 deletions guides/v2.1/cloud/cdn/configure-fastly.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,26 @@ You cannot use the Fastly service in Integration environments.
2. Wait for dependencies to be updated.
3. Enter the following command to fully update and clear the cache:

php bin/magento setup:upgrade && php bin/magento cache:clean
```bash
php bin/magento setup:upgrade && php bin/magento cache:clean
```

4. Edit your composer.json and ensure the Fastly module is included with version.

* In the "require" section, you should have `"fastly/magento2": <version number>`
* In the "repositories" section, you should have:

```json
"fastly-magento2": {
"url": "https://github.com/fastly/fastly-magento2.git"
}
```

3. Add, commit, and push the changes to your code repository with the following command:

"fastly-magento2": {
"url": "https://github.com/fastly/fastly-magento2.git"
}
3. Add, commit, and push the changes to your code repository with the following
command:

git add -A; git commit -m "Install Fastly"; git push origin <branch name>
```bash
git add -A; git commit -m "Install Fastly" && git push origin <branch name>
```

4. Merge the branch code with the `master` Integration branch.

Expand Down
8 changes: 4 additions & 4 deletions guides/v2.1/cloud/cdn/trouble-fastly.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ Fastly API requests are passed through the Fastly extension to get a response fr
1. In a terminal, use the following `curl` command to test your live site URL:

```bash
curl https://<live URL> -vo /dev/null -H Fastly-Debug:1
curl https://<live URL> -vo /dev/null -H Fastly-Debug:1
```

If you have not set a static route or completed the DNS configuration for the domains on your live site, use the `--resolve` flag, which bypasses DNS name resolution.

```bash
curl https://<live URL> -vo /dev/null -H Fastly-Debug:1 [--resolve] <live URL hostname>:443:<live IP address>
curl https://<live URL> -vo /dev/null -H Fastly-Debug:1 [--resolve] <live URL hostname>:443:<live IP address>
```

1. In the response, verify the [headers](#response-headers) to ensure that Fastly is working. You should see following unique headers in the response:
Expand Down Expand Up @@ -182,13 +182,13 @@ If the Fastly service returns incorrect headers, submit a Fastly API request dir
For example, if you have a public URL www.mymagento.biz, enter a command similar to the following to test the production site:

```bash
curl -k https://www.mymagento.biz.c.sv7gVom4qrpek.ent.magento.cloud -H 'Host: www.mymagento.biz' -vo /dev/null -H Fastly-Debug:1
curl -k https://www.mymagento.biz.c.sv7gVom4qrpek.ent.magento.cloud -H 'Host: www.mymagento.biz' -vo /dev/null -H Fastly-Debug:1
```

If you have not completed the DNS configuration for the public hostname, remove the `"Host:<URL>"` option as shown in the following example:

```bash
curl -k https://www.mymagento.biz.c.sv7gVom4qrpek.ent.magento.cloud -vo /dev/null -H Fastly-Debug:1
curl -k https://www.mymagento.biz.c.sv7gVom4qrpek.ent.magento.cloud -vo /dev/null -H Fastly-Debug:1
```

2. In the response, check for errors in the [cache HIT and MISS headers](#response-headers).
Expand Down
1 change: 1 addition & 0 deletions guides/v2.1/cloud/docker/docker-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ Before you begin, you must add the following hostname to your `/etc/hosts` file:
```bash
./vendor/bin/ece-tools docker:config:convert
```

This command generates the following Docker ENV files:

* `docker/config.env`
Expand Down
3 changes: 3 additions & 0 deletions guides/v2.1/cloud/env/setup-notifications.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ To configure notifications:

```bash
git -A && git commit -m "Configure build/deploy notifications"
```

```bash
git push origin <branch-name>
```

Expand Down
24 changes: 24 additions & 0 deletions guides/v2.1/cloud/howtos/install-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,19 @@ To update `composer.json`:

```bash
composer require <component-name>:<version> --no-update
```

```bash
composer update
```

For example:

```bash
composer require pixlee/magento2:1.0.1 --no-update
```

```bash
composer update
```

Expand All @@ -69,7 +75,13 @@ To update `composer.json`:

```bash
git add -A
```

```bash
git commit -m "<message>"
```

```bash
git push origin <environment ID>
```

Expand Down Expand Up @@ -153,7 +165,13 @@ You can use CLI commands or directly edit `app/etc/config.php` to enable or disa

```bash
git add -A
```

```bash
git commit -m "<message>"
```

```bash
git push origin <environment ID>
```

Expand Down Expand Up @@ -188,7 +206,13 @@ To update an extension:

```bash
git add -A
```

```bash
git commit -m "<message>"
```

```bash
git push origin <environment ID>
```

Expand Down
19 changes: 15 additions & 4 deletions guides/v2.1/cloud/howtos/sample-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,27 @@ To install sample data:
1. If you have not done so already, check out the environment in which to install sample data.
2. In a terminal, enter the following commands:

<Magento root dir>/bin/magento sampledata:deploy
```bash
<magento_root>/bin/magento sampledata:deploy
```

3. Wait for components to update.
4. Commit and push the changes:

git add -A && git commit -m "Install sample data"
git push origin <branch name>
```bash
git add -A && git commit -m "Install sample data"
```

```bash
git push origin <branch name>
```

5. Wait for the project to deploy.
6. Verify the installation was successful by going to your storefront main page in the Integration environment. You can locate the URL link to the storefront through the Project Web Interface.
7. Take a snapshot of your environment:

magento-cloud snapshot:create -e <environment ID>
```bash
magento-cloud snapshot:create -e <environment ID>
```

You can start testing your development with live data!
21 changes: 16 additions & 5 deletions guides/v2.1/cloud/live/live-sanity-check.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@ Sometimes you just want to test your build prior to pushing your code to Git. Yo
2. Move to another location to run your build. You should keep this build separate from your usual Git branch.
3. Run the following command to build locally. The command builds the current project locally strictly to test the build without the full patching and commit process.

magento-cloud local:build
```bash
magento-cloud local:build
```

For details, enter `magento-cloud local:build --help`.

For details, enter `magento-cloud local:build --help`.
4. Watch for the results. A series of files will generate for the build. If you do not encounter errors, you can [push code to the remote Git branch](#push) and continue.

If errors occur during the build, you can investigate and resolve the code issues. You should not commit the files from this build to Git.
Expand Down Expand Up @@ -132,6 +135,7 @@ Before you continue, you must know the file system path to any patch we provided
```bash
php bin/magento setup:di:compile
```

This command can take several minutes to complete and produces messages similar to the following:

```terminal
Expand Down Expand Up @@ -167,15 +171,22 @@ We highly recommend having Magento already installed prior to deployment. During
2. Change to your project root directory.
3. Enter the following command:

php bin/magento setup:upgrade
```bash
php bin/magento setup:upgrade
```

We highly recommend having Magento already installed if you followed the [First time deployment]({{ page.baseurl }}/cloud/setup/first-time-deploy.html). If you have not installed the Magento application yet, use the [`magento setup:install`]({{ page.baseurl }}/install-gde/install/cli/install-cli.html) command instead. Be advised, you may encounter issues with enabled modules on a fresh installation.
4. Clean the Magento cache:

php bin/magento cache:clean
```bash
php bin/magento cache:clean
```

5. Set the Magento application for [production mode]({{ page.baseurl }}/config-guide/bootstrap/magento-modes.html#production-mode):

php bin/magento deploy:mode:set production
```bash
php bin/magento deploy:mode:set production
```

If errors display, debug them if possible, [review logs]({{ page.baseurl }}/cloud/trouble/environments-logs.html), or open a [support ticket]({{ page.baseurl }}/cloud/trouble/trouble.html) to get additional assistance.

Expand Down
Loading