diff --git a/Dockerfile b/Dockerfile index 594a4b81..51f146d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,8 @@ ARG CREATED ARG VERSION ARG GIT_REF=origin/master +ENV CONDUIT_CONFIG="/srv/conduit/conduit.toml" + # Labels according to https://github.com/opencontainers/image-spec/blob/master/annotations.md # including a custom label specifying the build command LABEL org.opencontainers.image.created=${CREATED} \ diff --git a/README.md b/README.md index 3a8384fa..ac603e68 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ docker run -d -p 8448:8000 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/sr ``` > Note: You also need to supply a `conduit.toml` config file, you can find an example [here](./conduit-example.toml). +> Or you can pass in `-e CONDUIT_CONFIG=""` and configure Conduit purely with env vars. Or build and run it with docker or docker-compose. [Read more](docker/README.md) diff --git a/docker-compose.yml b/docker-compose.yml index 38c8a117..cb98a112 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,9 @@ services: ### Uncomment and change values as desired # CONDUIT_ADDRESS: 127.0.0.1 # CONDUIT_PORT: 8000 - # CONDUIT_LOG: normal # Available levels are: off, debug, normal, critical + # CONDUIT_CONFIG: '/srv/conduit/conduit.toml' # if want to configure purely by env vars, set this to an empty string '' + # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging + # CONDUIT_LOG: info # default is: "info,rocket=off,_=off,sled=off" # CONDUIT_ALLOW_JAEGER: 'false' # CONDUIT_ALLOW_REGISTRATION : 'false' # CONDUIT_ALLOW_ENCRYPTION: 'false' diff --git a/docker/README.md b/docker/README.md index 6bf36f1d..499d1adb 100644 --- a/docker/README.md +++ b/docker/README.md @@ -44,7 +44,8 @@ docker run -d -p 8448:8000 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/sr ``` For detached mode, you also need to use the `-d` flag. You also need to supply a `conduit.toml` config file, you can find an example [here](../conduit-example.toml). -You can pass in more env vars as are shown here, for an overview of possible values, you can take a look at the `docker-compose.yml` file. +You can pass in different env vars to change config values on the fly. You can even configure Conduit completely by using env vars, but for that you need +too pass `-e CONDUIT_CONFIG=""` into your container. For an overview of possible values, please take a look at the `docker-compose.yml` file. If you just want to test Conduit for a short time, you can use the `--rm` flag, which will clean up everything related to your container after you stop it. diff --git a/docker/docker-compose.traefik.yml b/docker/docker-compose.traefik.yml index 25497c6a..ef14ca95 100644 --- a/docker/docker-compose.traefik.yml +++ b/docker/docker-compose.traefik.yml @@ -29,7 +29,9 @@ services: ### Uncomment and change values as desired # CONDUIT_ADDRESS: 127.0.0.1 # CONDUIT_PORT: 8000 - # CONDUIT_LOG: normal # Available levels are: off, debug, normal, critical + # CONDUIT_CONFIG: '/srv/conduit/conduit.toml' # if want to configure purely by env vars, set this to an empty string '' + # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging + # CONDUIT_LOG: info # default is: "info,rocket=off,_=off,sled=off" # CONDUIT_ALLOW_JAEGER: 'false' # CONDUIT_ALLOW_REGISTRATION : 'false' # CONDUIT_ALLOW_ENCRYPTION: 'false'