Commit Graph

57174 Commits

Author SHA1 Message Date
Allie Sadler ec5dc89d85 Expose level 4 headings in the right-hand toc 2022-04-13 14:01:58 +01:00
jerae-duffin 2acdd55e1c
Merge pull request #14543 from thaJeztah/desktop_install
desktop/mac: add missing prompt and highlighting for install
2022-04-12 14:54:37 -05:00
Sebastiaan van Stijn 3eec56de26
desktop/mac: add missing prompt and highlighting for install
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-12 20:08:20 +02:00
Allie Sadler eb8a7832b0
Merge pull request #14541 from aevesdocker/ENGDOCS-643
tweaks so users can copy and paste the code
2022-04-12 16:23:49 +01:00
Allie Sadler d91c431292 tweaks so users can copy and paste the code 2022-04-12 16:10:29 +01:00
Usha Mandya 45b520a36a
Merge pull request #14539 from thaJeztah/fix_formatting
Fix some formatting issues
2022-04-12 11:40:12 +01:00
Sebastiaan van Stijn cc62b154b8
language/java: fix code-hint to use the correct language
This block now shows java code, so changing the code-hint to make
sure it's highlighted correctly.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-12 11:56:01 +02:00
Sebastiaan van Stijn 461c6935c4
fix aligning in some output examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-04-12 11:44:41 +02:00
Usha Mandya b3be4124d1
Merge pull request #14529 from usha-mandya/sbom-patch
fix console output
2022-04-08 20:13:45 +01:00
Usha Mandya 1ffb53ee8c fix console output
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2022-04-08 20:05:56 +01:00
Jake Levirne ab4991f9b2
Update dev-environments.md to match dialog (#14368)
* Update dev-environments.md to match dialog

Updated to match the "Create a Dev Environment" dialog in Docker Desktop 4.5.0 (74594)

* Apply suggestions from code review

Update instructions to match the latest UI udpates

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2022-04-08 11:36:46 +01:00
Usha Mandya 3e55e4ab63
Merge pull request #14352 from giudega/updateTests
removed reference to code line
2022-04-08 11:25:28 +01:00
Usha Mandya 669f796938
Merge pull request #14463 from marcopus/patch-1
Update envvars.md
2022-04-08 10:59:23 +01:00
Usha Mandya 57def2fc5e
Merge pull request #14381 from zekicelik/master
update osx-setup-guide.md for #14380
2022-04-08 10:53:45 +01:00
Usha Mandya 7cc992a3fe
Merge pull request #14349 from giudega/master
removed reference to code line number
2022-04-08 10:53:34 +01:00
Usha Mandya 2008481b4d
Merge pull request #14363 from jonasbn/patch-1
The Alpine 3.5 image is no longer available
2022-04-08 10:47:55 +01:00
Usha Mandya d5801996a9
Merge pull request #14390 from mat007/docker-desktop-4.6.0-release-notes
Add note about CVE-2022-0847 fix being shipped by microsoft
2022-04-08 10:16:59 +01:00
Sebastiaan van Stijn 2ec61594a5
Merge pull request #14510 from Mandraenke/patch-1
added misssing "driver"
2022-04-08 00:14:35 +02:00
Sebastiaan van Stijn de0e1ed2cf
Merge pull request #14524 from halprin/patch-1
Terminate the console fix-width example for --output on the SBOM page
2022-04-08 00:13:20 +02:00
halprin 0d79d56878
Terminate the console fix-width example for --output 2022-04-07 15:57:39 -06:00
Usha Mandya 4856f29d23
Docker Desktop 4.7.0 release notes (#14505)
Signed-off-by: Emmanuel Briney <emmanuel.briney@gmail.com>
2022-04-07 16:08:48 +01:00
Chris Crone 287e23b48d
Add initial SBOM docs (#14516)
* sbom: Add initial docs

Signed-off-by: Chris Crone <christopher.crone@docker.com>

* Apply suggestions from code review

Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>

* Apply suggestions from code review

* Update engine/sbom/index.md

Add a new section for feedback

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2022-04-07 16:00:22 +01:00
jerae-duffin 4bbe0ba6a6
Merge pull request #14511 from jerae-duffin/ENGDOCS-636
update to Hub
2022-04-07 09:59:42 -05:00
Mathieu Champlon 174fba5027
Merge pull request #14455 from mat007/add-installer-command-line-docs
DKP-118 Add Docker Desktop 4.7.0 installer command line docs
2022-04-07 15:21:06 +01:00
jerae-duffin 17f9bd3b6e
Merge pull request #14509 from jerae-duffin/ENGDOCS-618
updated domain
2022-04-07 09:17:58 -05:00
Usha Mandya 9d1b25c7e0
Merge pull request #14487 from glours/update-compose-ref-doc-2.4.0
Update compose cli documentation to version v2.4.0
2022-04-07 15:07:42 +01:00
Usha Mandya 2380c8b9df
Merge pull request #14519 from thaJeztah/update_compose_instructions
update docker-compose.yml for compose v2, and remove temporary fix
2022-04-07 15:02:16 +01:00
jerae-duffin e3260b26a1
Merge pull request #14518 from docker/christophermclellan-patch-1
RAM - change reference to link in sidebar
2022-04-07 08:59:32 -05:00
Emmanuel Briney 413a35e897 Docker Desktop 4.7.0 release notes
Signed-off-by: Emmanuel Briney <emmanuel.briney@gmail.com>
2022-04-07 15:29:15 +02:00
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
Chris McLellan 9729f93789
RAM - change reference to link in sidebar
* Change reference to link in sidebar
2022-04-07 11:28:33 +01: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
Jerae Duffin b6ff12b749 update to Hub 2022-04-06 08:31:11 -05: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
Mandraenke 0de0cf0f1d
added misssing "driver"
The example for setting the MTU on the swarm ingress network uses the wrong property:

`--opt com.docker.network.mtu=1200`

instead of

`--opt com.docker.network.driver.mtu=1200`
2022-04-06 08:40:20 +02:00
Jerae Duffin 2eaed3b442 updated domain 2022-04-05 17:48:06 -05: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
Mathieu Champlon eb2b74c45b Add note about CVE-2022-0847 fix being shipped by microsoft 2022-04-04 16:21:49 +02: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