Add CONDUIT_CONFIG to all relevant docker files
And mention that an empty string can be used to configure Conduit purely with env vars.
This commit is contained in:
		
							parent
							
								
									beb428d866
								
							
						
					
					
						commit
						5a7ccbdfab
					
				
					 5 changed files with 11 additions and 3 deletions
				
			
		|  | @ -42,6 +42,8 @@ ARG CREATED | ||||||
| ARG VERSION | ARG VERSION | ||||||
| ARG GIT_REF=origin/master | 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 | # Labels according to https://github.com/opencontainers/image-spec/blob/master/annotations.md | ||||||
| # including a custom label specifying the build command | # including a custom label specifying the build command | ||||||
| LABEL org.opencontainers.image.created=${CREATED} \ | LABEL org.opencontainers.image.created=${CREATED} \ | ||||||
|  |  | ||||||
|  | @ -86,6 +86,7 @@ docker run -d -p 8448:8000 -v ~/conduit.toml:/srv/conduit/conduit.toml -v db:/sr | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| > <b>Note:</b> You also need to supply a `conduit.toml` config file, you can find an example [here](./conduit-example.toml). | > <b>Note:</b> 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) | Or build and run it with docker or docker-compose. [Read more](docker/README.md) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -29,7 +29,9 @@ services: | ||||||
|             ### Uncomment and change values as desired |             ### Uncomment and change values as desired | ||||||
|             # CONDUIT_ADDRESS: 127.0.0.1 |             # CONDUIT_ADDRESS: 127.0.0.1 | ||||||
|             # CONDUIT_PORT: 8000 |             # 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_JAEGER: 'false' | ||||||
|             # CONDUIT_ALLOW_REGISTRATION : 'false' |             # CONDUIT_ALLOW_REGISTRATION : 'false' | ||||||
|             # CONDUIT_ALLOW_ENCRYPTION: 'false' |             # CONDUIT_ALLOW_ENCRYPTION: 'false' | ||||||
|  |  | ||||||
|  | @ -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). | 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. | 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. | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -29,7 +29,9 @@ services: | ||||||
|             ### Uncomment and change values as desired |             ### Uncomment and change values as desired | ||||||
|             # CONDUIT_ADDRESS: 127.0.0.1 |             # CONDUIT_ADDRESS: 127.0.0.1 | ||||||
|             # CONDUIT_PORT: 8000 |             # 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_JAEGER: 'false' | ||||||
|             # CONDUIT_ALLOW_REGISTRATION : 'false' |             # CONDUIT_ALLOW_REGISTRATION : 'false' | ||||||
|             # CONDUIT_ALLOW_ENCRYPTION: 'false' |             # CONDUIT_ALLOW_ENCRYPTION: 'false' | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue