diff --git a/content/manuals/engine/daemon/_index.md b/content/manuals/engine/daemon/_index.md index 32fcab96287a..c4ae0d1286fc 100644 --- a/content/manuals/engine/daemon/_index.md +++ b/content/manuals/engine/daemon/_index.md @@ -37,11 +37,12 @@ This page shows you how to customize the Docker daemon, `dockerd`. ## Configure the Docker daemon -There are two ways to configure the Docker daemon: +There are three ways to configure the Docker daemon: - Use a JSON configuration file. This is the preferred option, since it keeps all configurations in a single place. - Use flags when starting `dockerd`. +- Use environment variables to set daemon options. You can use both of these options together as long as you don't specify the same option both as a flag and in the JSON file. If that happens, the Docker daemon @@ -92,6 +93,32 @@ running: $ dockerd --help ``` +### Configuration using environment variables + +You can configure the Docker daemon using environment variables. This is useful +in systemd service overrides or init scripts. + +To set environment variables for the Docker daemon using systemd, create a +drop-in override file: + +````````console +$ sudo systemctl edit docker +``````` + +Add the following: + +``````ini +[Service] +Environment="DOCKER_OPTS=--debug --tls=true" +````` + +Then reload and restart the daemon: + +````console +$ sudo systemctl daemon-reload +$ sudo systemctl restart docker +``` + ## Daemon data directory The Docker daemon persists all data in a single directory. This tracks diff --git a/content/manuals/scout/integrations/environment/_index.md b/content/manuals/scout/integrations/environment/_index.md index 4dfa8eb7fdc0..5bc0cd93b03c 100644 --- a/content/manuals/scout/integrations/environment/_index.md +++ b/content/manuals/scout/integrations/environment/_index.md @@ -30,7 +30,7 @@ that version of the image to the `staging` environment. To add environments to Docker Scout, you can: -- Use the `docker scout env ` CLI command to record images to environments manually +- Use the `docker scout environment ` CLI command to record images to environments manually - Enable a runtime integration to automatically detect images in your environments. Docker Scout supports the following runtime integrations: @@ -52,7 +52,7 @@ To see all of the available environments for an organization, you can use the `docker scout env` command. ```console -$ docker scout env +$ docker scout environment ``` By default, this prints all environments for your personal Docker organization. @@ -60,7 +60,7 @@ To list environments for another organization that you're a part of, use the `--org` flag. ```console -$ docker scout env --org +$ docker scout environment --org ``` You can use the `docker scout config` command to change the default @@ -101,7 +101,7 @@ environment, all versions of the image appear in the list. Alternatively, you can use the `docker scout env` command to view the images from the terminal. ```console -$ docker scout env production +$ docker scout environment production docker/scout-demo-service:main@sha256:ef08dca54c4f371e7ea090914f503982e890ec81d22fd29aa3b012351a44e1bc ```