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
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
8 changes: 4 additions & 4 deletions guides/v2.1/cloud/docker/docker-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ Continue launching your Docker environment in the default _production_ mode.
1. _Optional_: Copy the raw configuration files.

```bash
cp docker/config.php.dist docker/config.php
cp .docker/config.php.dist .docker/config.php
```

1. _Optional_: Convert the PHP configuration files to Docker ENV files.
Expand All @@ -107,7 +107,7 @@ Continue launching your Docker environment in the default _production_ mode.

This command generates the following Docker ENV files:

* `docker/config.env`
* `.docker/config.env`

{: .bs-callout .bs-callout-info}
The `{{site.data.var.ct}}` version 2002.0.12 package does not support the `docker:config:convert` command.
Expand Down Expand Up @@ -170,7 +170,7 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.
1. _Optional_: Copy the raw configuration files.

```bash
cp docker/config.php.dist docker/config.php
cp .docker/config.php.dist .docker/config.php
```

1. _Optional_: Convert the PHP configuration files to Docker ENV files.
Expand All @@ -181,7 +181,7 @@ The `{{site.data.var.ct}}` version 2002.0.18 and later supports developer mode.

This command generates the following Docker ENV files:

* `docker/config.env`
* `.docker/config.env`

1. _Optional_: Configure the Docker global variables in the `docker-compose.yaml` file. For example, you can [enable and configure Xdebug]({{ page.baseurl }}/cloud/docker/docker-development-debug.html).

Expand Down
6 changes: 3 additions & 3 deletions guides/v2.1/cloud/docker/docker-database.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ functional_areas:
- Configuration
---

There are two ways to connect to the database. Before you begin, you can find the database credentials in the `database` section of the `docker/config.php` file. The examples use the following default credentials:
There are two ways to connect to the database. Before you begin, you can find the database credentials in the `database` section of the `.docker/config.php` file. The examples use the following default credentials:

> Filename: `docker/config.php`
> Filename: `.docker/config.php`

```php?start_inline=1
return [
Expand Down Expand Up @@ -85,4 +85,4 @@ return [
| 10.0.38-MariaDB-1~xenial |
+--------------------------+
```
{: .no-copy}
{: .no-copy}
2 changes: 1 addition & 1 deletion guides/v2.1/cloud/docker/docker-development-debug.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ generic:
- PHP_IDE_CONFIG=serverName=magento_cloud_docker
- XDEBUG_CONFIG=remote_host=host.docker.internal
env_file:
- ./docker/config.env
- ./.docker/config.env
```

You can change any Xdebug configuration using the`XDEBUG_CONFIG` option. For example, to change the `xdebug.remote_port` option:
Expand Down
6 changes: 3 additions & 3 deletions guides/v2.1/cloud/docker/docker-development.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ The database container is based on the `mariadb:10` image.

#### To import a database dump:

Place the SQL file into the `docker/mysql/docker-entrypoint-initdb.d` folder.
Place the SQL file into the `.docker/mysql/docker-entrypoint-initdb.d` folder.

The `{{site.data.var.ct}}` package imports and processes the SQL file the next time you build and start the Docker environment using the `docker-compose up` command.

Although it is a more complex approach, you can use GZIP by _sharing_ the `.sql.gz` file using the `docker/mnt` directory and importing it inside the Docker container.
Although it is a more complex approach, you can use GZIP by _sharing_ the `.sql.gz` file using the `.docker/mnt` directory and importing it inside the Docker container.

## Varnish container

Expand All @@ -90,7 +90,7 @@ The TLS termination proxy container, based on the [magento/magento-cloud-docker

## Sharing data between host machine and container

You can share files easily between your machine and a Docker container by placing the files in the `docker/mnt` directory. You can find the files in the `/mnt` directory the next time you build and start the Docker environment using the `docker-compose up` command.
You can share files easily between your machine and a Docker container by placing the files in the `.docker/mnt` directory. You can find the files in the `/mnt` directory the next time you build and start the Docker environment using the `docker-compose up` command.

## Sendmail service

Expand Down
14 changes: 14 additions & 0 deletions guides/v2.1/cloud/docker/docker-quick-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,17 @@ php ./vendor/bin/ece-tools list | grep docker
| ------------ | ---------------- | ------------------
| Mode | `--mode`, `-m` | production, developer

## bin/docker

Action | Command
:----- | :------
Pull latest images | pull
Destroy, re-create and start containers | up
Destroy containers | down
Build application | build
Deploy application | up
Re-build and re-deploy application | redeploy
Connect to bash | bash
Stop containers | stop
Start containers | start
Restart containers | restart