Commit Graph

57132 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 324db4e44a
update docker-compose.yml for compose v2, and remove temporary fix
This updates the instructions in the docker-compose.yml to use
"docker compose" (v2) instead of "docker-compose".

Also removing a workaround for a bug in older versions of compose,
where build-args did not properly inherit their value from the
current environment. Testing this scenario on a current version
of compose shows that that problem has been resolved:

Using this compose-file:

```yaml
services:
  docs:
    build:
      args:
        - JEKYLL_ENV
      context: .
```

And this Dockerfile:

```dockerfile
ARG JEKYLL_ENV=default

FROM alpine
ARG JEKYLL_ENV
RUN echo $JEKYLL_ENV >> /result.txt
CMD cat /result.txt
```

It looks like this issue has been resolved:

Without setting the `JEKYLL_ENV` environment variable, the Dockerfile correctly uses
the default value from the Dockerfile:

```console
docker compose build
[+] Building 0.6s (6/6) FINISHED
 => [internal] load build definition from Dockerfile                                         0.1s
 => => transferring dockerfile: 31B                                                          0.0s
 => [internal] load .dockerignore                                                            0.0s
 => => transferring context: 2B                                                              0.0s
 => [internal] load metadata for docker.io/library/alpine:latest                             0.0s
 => CACHED [1/2] FROM docker.io/library/alpine                                               0.0s
 => [2/2] RUN echo default >> /result.txt                                                    0.3s
 => exporting to image                                                                       0.0s
 => => exporting layers                                                                      0.0s
 => => writing image sha256:c22cfa2355a910991d1bd4f4d83a0b9d4fad7dc73b1ea83fba05f8949e564591 0.0s
 => => naming to docker.io/library/composeenv_docs                                           0.0s

docker compose run --rm docs
default
```

And when setting `JEKYLL_ENV`, it's used to override the default in the Dockerfile:

```console
JEKYLL_ENV=production docker compose build
[+] Building 2.6s (6/6) FINISHED
 => [internal] load build definition from Dockerfile                                         0.5s
 => => transferring dockerfile: 120B                                                         0.0s
 => [internal] load .dockerignore                                                            0.4s
 => => transferring context: 2B                                                              0.0s
 => [internal] load metadata for docker.io/library/alpine:latest                             0.0s
 => [1/2] FROM docker.io/library/alpine                                                      0.0s
 => [2/2] RUN echo production >> /result.txt                                                 1.6s
 => exporting to image                                                                       0.1s
 => => exporting layers                                                                      0.1s
 => => writing image sha256:a05ca33d07d411660bd26f817a3d9201f3d7f15d198879cadc70e83e5d1f7fd5 0.0s
 => => naming to docker.io/library/composeenv_docs                                           0.0s

docker compose run --rm docs
production
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-07 12:38:44 +02:00
Allie Sadler c38f20e763
Merge pull request #14512 from aevesdocker/ENGDOCS-635
Fixed a small typo to the docker hub overview page
2022-04-06 16:31:50 +01:00
Usha Mandya 91b9b544d9
Merge pull request #14502 from usha-mandya/engdocs-631
Update the Docs homepage banner
2022-04-06 16:26:19 +01:00
Ulysses Souza 8b6e052eee
Add inline comments section (#14507)
* Add inline comments section

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

* Update compose/compose-file/compose-file-v3.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-04-06 16:10:06 +01:00
Usha Mandya e67238205e Update the Docs homepage banner
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-04-06 16:08:51 +01:00
Allie Sadler 80dc47429a Fixed a small typo to the docker hub overview page 2022-04-06 16:05:00 +01:00
Usha Mandya 026949047e
Merge pull request #11140 from pimuzzo/add-s3accelerate-doc
Add accelerate documentation
2022-04-06 13:41:38 +01:00
Usha Mandya a6739169e9
Merge branch 'master' into add-s3accelerate-doc 2022-04-06 13:36:39 +01:00
Usha Mandya 18e2e5f80d
Merge pull request #14508 from aiordache/dd4l_new_deb
DD4L: deb package with fix for ubuntu 22.04
2022-04-06 10:33:04 +01:00
Anca Iordache 8ef19d2e44 DD4L: deb package with fix for ubuntu 22.04
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2022-04-05 20:01:22 +02:00
Sebastiaan van Stijn 11548d686e
Merge pull request #14506 from usha-mandya/composefile-xref-patch
Fix a crossreference to the compose file spec page
2022-04-05 14:22:35 +02:00
Usha Mandya 2083fbb63c Fix a crossref to the compose file spec page
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-04-05 12:55:33 +01:00
Bart Duisters a4de787aed
Update 07_multi_container.md (#14234)
* Update 07_multi_container.md

Add a script that works on M1 chips for people following this guide on Apple Silicon.

* Add shell prompt, use linux/amd64

Co-authored-by: Stefan Scherer <stefan.scherer@docker.com>
2022-04-04 13:45:40 +01:00
Sebastiaan van Stijn 807c6009a0
Merge pull request #14494 from thaJeztah/update_engine_reference
engine: update reference docs with latest changes from 20.10 branch
2022-04-02 00:12:57 +02:00
Sebastiaan van Stijn 098129a0c1
engine: update reference docs with latest changes from 20.10 branch
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-01 21:37:25 +02:00
Usha Mandya e9e09ef39d
Merge pull request #14493 from usha-mandya/engdocs-623
Remove DNS settings info from Windows user manual
2022-04-01 16:53:00 +01:00
Usha Mandya 1190d3c5e9 Remove DNS info from Windows user manual
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-04-01 15:07:15 +01:00
Chris McLellan c6fe68ce79
Merge pull request #14488 from docker/linux-issue-tracker
Update index.md
2022-04-01 12:23:21 +01:00
Chris McLellan dffe6c3675
Update index.md 2022-04-01 12:15:26 +01:00
Chris McLellan f6130a53fd
Update desktop/linux/index.md
Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-04-01 12:14:53 +01:00
Chris McLellan 6ea99b800f
Update index.md 2022-04-01 11:59:04 +01:00
Usha Mandya 8b2ab248c0
Merge pull request #14389 from alamirfan/patch-1
Environment variable POSTGRES_NAME should be POSTGRES_DB for the db service
2022-04-01 11:34:25 +01:00
Usha Mandya fe24255165
Merge pull request #14471 from shaggyyy2002/master
The E in ECS is Elastic, not EC2
2022-04-01 10:49:25 +01:00
Usha Mandya 6b047f38d5
Merge pull request #14417 from YgorPerez/patch-1
Add new step 1 "Exit MySQL"
2022-04-01 10:46:33 +01:00
Usha Mandya 19de201738
Merge pull request #14397 from SethuMK/patch-2
missed & in the powershellcommand
2022-04-01 10:31:04 +01:00
Usha Mandya 9e4122df29
Merge pull request #14474 from shjin404/patch-1
Update 06 bind mount page
2022-04-01 10:17:17 +01:00
Sebastiaan van Stijn 8b42e4a4d6
Merge pull request #14483 from thaJeztah/fix_iam_codeblocks
IAM: fix missing prompt, causing code to not be selectable
2022-04-01 00:15:11 +02:00
Sebastiaan van Stijn ff2022f292
Merge pull request #14484 from thaJeztah/no_quirks
move "page generated" comment to prevent rendering in quirks mode
2022-04-01 00:14:43 +02:00
Sebastiaan van Stijn 5224d842a6
Merge pull request #14485 from thaJeztah/fix_get_started_formatting
reformat "get started" 06 - bind-mounts
2022-04-01 00:05:41 +02:00
Sebastiaan van Stijn dddeb5a51e
reformat "get started" 06 - bind-mounts
The "docker build" example was written as an in-line example, but directly
followed by a full-stop at the end of the sentence, which made it easy to
confuse the extra `.` to be part of the command to run.

This moves it to a code block to allow the example to be highlighted, and
less confusing.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 23:51:22 +02:00
Sebastiaan van Stijn a7c4a6bdd9
move "page generated" comment to prevent rendering in quirks mode
As described on https://en.wikipedia.org/wiki/Quirks_mode, a comment
preceding the `<!DOCTYPE html>` can cause some browsers to render the
HTML in quirks mode.

This patch moves the comment after the doctype to prevent this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 23:26:35 +02:00
Sebastiaan van Stijn 07ba341736
IAM: fix missing prompt, causing code to not be selectable
This code-block uses the "console" highlighting, which considers lines that do
not start with a prompt to be "output" of the command, and non-selectable.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-31 22:28:12 +02:00
Usha Mandya db82a1844d
Merge pull request #14416 from usha-mandya/engdocs-602
Move Compose file ref to the legacy node
2022-03-31 19:01:56 +01:00
Usha Mandya 423d2ccac7
Merge pull request #14481 from usha-mandya/dd4l-engine-install-patch
Update note on DD4L beta
2022-03-31 17:37:19 +01:00
Usha Mandya 1cf511078d Update note on DD4L beta
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-03-31 17:26:01 +01:00
Usha Mandya 3534245ac6
Merge pull request #14480 from aiordache/dd4l_updates
DD4L doc updates
2022-03-31 15:11:10 +01:00
Anca Iordache 32d351a5f8 DD4L doc updates
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2022-03-31 16:05:05 +02:00
Anca Iordache c10ba039e5
DD4L: document pass setup and use (#14477)
* DD4L: document pass setup and use

Signed-off-by: Anca Iordache <anca.iordache@docker.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-03-31 10:54:12 +01:00
Piotr 55d18699e4
desktop/linux: Add instructions to remove old systemd units (#14468)
* desktop/linux: Add instructions to remove old systemd units

Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

* Update desktop/linux/index.md

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-03-31 10:25:43 +01:00
shjin404 bca3ed715c
Update 06 bind mount page
Updated the instruction to ensure running the command from the app directory.
2022-03-30 22:50:52 -07:00
jerae-duffin fb8cf9a7c9
Merge pull request #14467 from jerae-duffin/ENGDOCS-618
updated PATs
2022-03-30 14:01:18 -05:00
jerae-duffin cee6f91f3c
Merge pull request #14449 from jerae-duffin/ENGDOCS-607
Updated onboarding FAQs
2022-03-30 12:58:40 -05:00
Jerae Duffin 4d69dd8a9b updated onboarding faqs 2022-03-30 12:30:19 -05:00
Sebastiaan van Stijn e35c75fa60
Merge pull request #14472 from PeterBParker/master
Update compose-file-v3.md
2022-03-30 19:26:48 +02:00
PeterBParker eef12c06a4
Update compose-file-v3.md
corrected duplicate being verb
2022-03-30 11:55:05 -05:00
Nitin Gouda 28ff2eda40
Merge pull request #1 from shaggyyy2002/shaggyyy2002-patch-1
Update ecs-integration.md
2022-03-30 19:35:33 +05:30
Nitin Gouda 8bdda2079d
Update ecs-integration.md 2022-03-30 19:34:33 +05:30
Usha Mandya 16a7311c38
Merge pull request #14469 from usha-mandya/engdocs-620
Clarify DD4L is not supported in nested virt scenarios
2022-03-30 12:07:21 +01:00
Usha Mandya 441af0253c Clarify DD4L is not supported in nested virt scenarios
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-03-30 11:54:29 +01:00
Jerae Duffin 4717e3d082 mend 2022-03-29 17:16:40 -05:00