* desktop: no need to mention "in a docker container" for k8s
It's an implementation detail.
Signed-off-by: David Scott <dave.scott@docker.com>
* desktop: `docker ps` rather than `docker service ls`
`docker service ls` is a Swarm API. We could use `docker container ls`
but to be honest everyone prefers `docker ps` since it's shorter.
Signed-off-by: David Scott <dave.scott@docker.com>
* desktop: move the option that no-one needs after the screenshot
We want to emphasize how easy it is to enable and avoid telling people
about advanced features which they don't need up front.
Signed-off-by: David Scott <dave.scott@docker.com>
* desktop: the section on kubectl is not a pre-req
It's not possible to use the docker-desktop kubernetes context because
it hasn't been created yet.
Signed-off-by: David Scott <dave.scott@docker.com>
* desktop: merge the kubectl sections
Signed-off-by: David Scott <dave.scott@docker.com>
* Add link to Dockerfile/build reference
This fixes#12578
* Update develop/index.md
Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
When Docker Desktop doesn't start and the user runs the diagnostics from
a terminal, repeat the link to the paid support form.
Signed-off-by: David Scott <dave.scott@docker.com>
* updated registry.json
* updated install info
* fix some formatting issues for registry.json instructions
- use `console` blocks for command-line examples
- use different prompts for "powershell" and "non-powershell" examples
- fix path of registry.json on macOS
- wrap some of the lines to ~80 chars
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
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>
* 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>
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>
David Scott
Nikhil Sharma
Carlos H Brandt
Usha Mandya
jerae-duffin
Usha Mandya
Jerae Duffin
Sebastiaan van Stijn
David Scott
Emmanuel Briney
craig-osterhout
Allie Sadler
Allie Sadler
Sebastiaan van Stijn
Jake Levirne
halprin
Chris Crone
Mathieu Champlon
Chris McLellan