Skip to content

Commit e292feb

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Change env var and default formatting
1 parent b19c223 commit e292feb

File tree

2 files changed

+36
-31
lines changed

2 files changed

+36
-31
lines changed

‎README.md

+29-29
Original file line numberDiff line numberDiff line change
@@ -258,33 +258,33 @@ On MacOS or Windows systems, we recommend either using a VM or the provided `.de
258258

259259
| Environment variable | Default | Description |
260260
| - | - | - |
261-
| SETUP_SCRIPT | | SetupScript is the script to run before the init script. It runs as the root user regardless of the user specified in the devcontainer.json file. SetupScript is ran as the root user prior to the init script. It is used to configure envbuilder dynamically during the runtime. e.g. specifying whether to start systemd or tiny init for PID 1. |
262-
| INIT_SCRIPT | sleep infinity | InitScript is the script to run to initialize the workspace. |
263-
| INIT_COMMAND | /bin/sh | InitCommand is the command to run to initialize the workspace. |
264-
| INIT_ARGS | | InitArgs are the arguments to pass to the init command. They are split according to /bin/sh rules with https://github.com/kballard/go-shellquote. |
265-
| CACHE_REPO | | CacheRepo is the name of the container registry to push the cache image to. If this is empty, the cache will not be pushed. |
266-
| BASE_IMAGE_CACHE_DIR | | BaseImageCacheDir is the path to a directory where the base image can be found. This should be a read-only directory solely mounted for the purpose of caching the base image. |
267-
| LAYER_CACHE_DIR | | LayerCacheDir is the path to a directory where built layers will be stored. This spawns an in-memory registry to serve the layers from. |
268-
| DEVCONTAINER_DIR | | DevcontainerDir is a path to the folder containing the devcontainer.json file that will be used to build the workspace and can either be an absolute path or a path relative to the workspace folder. If not provided, defaults to `.devcontainer`. |
269-
| DEVCONTAINER_JSON_PATH | | DevcontainerJSONPath is a path to a devcontainer.json file that is either an absolute path or a path relative to DevcontainerDir. This can be used in cases where one wants to substitute an edited devcontainer.json file for the one that exists in the repo. |
270-
| DOCKERFILE_PATH | | DockerfilePath is a relative path to the Dockerfile that will be used to build the workspace. This is an alternative to using a devcontainer that some might find simpler. |
271-
| BUILD_CONTEXT_PATH | | BuildContextPath can be specified when a DockerfilePath is specified outside the base WorkspaceFolder. This path MUST be relative to the WorkspaceFolder path into which the repo is cloned. |
272-
| CACHE_TTL_DAYS | | CacheTTLDays is the number of days to use cached layers before expiring them. Defaults to 7 days. |
273-
| DOCKER_CONFIG_BASE64 | | DockerConfigBase64 is a base64 encoded Docker config file that will be used to pull images from private container registries. |
274-
| FALLBACK_IMAGE | | FallbackImage specifies an alternative image to use when neither an image is declared in the devcontainer.json file nor a Dockerfile is present. If there's a build failure (from a faulty Dockerfile) or a misconfiguration, this image will be the substitute. Set ExitOnBuildFailure to true to halt the container if the build faces an issue. |
275-
| EXIT_ON_BUILD_FAILURE | | ExitOnBuildFailure terminates the container upon a build failure. This is handy when preferring the FALLBACK_IMAGE in cases where no devcontainer.json or image is provided. However, it ensures that the container stops if the build process encounters an error. |
276-
| FORCE_SAFE | | ForceSafe ignores any filesystem safety checks. This could cause serious harm to your system! This is used in cases where bypass is needed to unblock customers. |
277-
| INSECURE | | Insecure bypasses TLS verification when cloning and pulling from container registries. |
278-
| IGNORE_PATHS | /var/run | IgnorePaths is a comma separated list of paths to ignore when building the workspace. |
279-
| SKIP_REBUILD | | SkipRebuild skips building if the MagicFile exists. This is used to skip building when a container is restarting. e.g. docker stop -> docker start This value can always be set to true - even if the container is being started for the first time. |
280-
| GIT_URL | | GitURL is the URL of the Git repository to clone. This is optional. |
281-
| GIT_CLONE_DEPTH | | GitCloneDepth is the depth to use when cloning the Git repository. |
282-
| GIT_CLONE_SINGLE_BRANCH | | GitCloneSingleBranch clones only a single branch of the Git repository. |
283-
| GIT_USERNAME | | GitUsername is the username to use for Git authentication. This is optional. |
284-
| GIT_PASSWORD | | GitPassword is the password to use for Git authentication. This is optional. |
285-
| GIT_HTTP_PROXY_URL | | GitHTTPProxyURL is the url for the http proxy. This is optional. |
286-
| WORKSPACE_FOLDER | | WorkspaceFolder is the path to the workspace folder that will be built. This is optional. |
287-
| SSL_CERT_BASE64 | | SSLCertBase64 is the content of an SSL cert file. This is useful for self-signed certificates. |
288-
| EXPORT_ENV_FILE | | ExportEnvFile is an optional file path to a .env file where envbuilder will dump environment variables from devcontainer.json and the built container image. |
289-
| POST_START_SCRIPT_PATH | | PostStartScriptPath is the path to a script that will be created by envbuilder based on the postStartCommand in devcontainer.json, if any is specified (otherwise the script is not created). If this is set, the specified InitCommand should check for the presence of this script and execute it after successful startup. |
261+
| `SETUP_SCRIPT` | | The script to run before the init script. It runs as the root user regardless of the user specified in the devcontainer.json file. SetupScript is ran as the root user prior to the init script. It is used to configure envbuilder dynamically during the runtime. e.g. specifying whether to start systemd or tiny init for PID 1. |
262+
| `INIT_SCRIPT` | `sleep infinity` | The script to run to initialize the workspace. |
263+
| `INIT_COMMAND` | `/bin/sh` | The command to run to initialize the workspace. |
264+
| `INIT_ARGS` | | The arguments to pass to the init command. They are split according to /bin/sh rules with https://github.com/kballard/go-shellquote. |
265+
| `CACHE_REPO` | | The name of the container registry to push the cache image to. If this is empty, the cache will not be pushed. |
266+
| `BASE_IMAGE_CACHE_DIR` | | The path to a directory where the base image can be found. This should be a read-only directory solely mounted for the purpose of caching the base image. |
267+
| `LAYER_CACHE_DIR` | | The path to a directory where built layers will be stored. This spawns an in-memory registry to serve the layers from. |
268+
| `DEVCONTAINER_DIR` | | The path to the folder containing the devcontainer.json file that will be used to build the workspace and can either be an absolute path or a path relative to the workspace folder. If not provided, defaults to `.devcontainer`. |
269+
| `DEVCONTAINER_JSON_PATH` | | The path to a devcontainer.json file that is either an absolute path or a path relative to DevcontainerDir. This can be used in cases where one wants to substitute an edited devcontainer.json file for the one that exists in the repo. |
270+
| `DOCKERFILE_PATH` | | The relative path to the Dockerfile that will be used to build the workspace. This is an alternative to using a devcontainer that some might find simpler. |
271+
| `BUILD_CONTEXT_PATH` | | Can be specified when a DockerfilePath is specified outside the base WorkspaceFolder. This path MUST be relative to the WorkspaceFolder path into which the repo is cloned. |
272+
| `CACHE_TTL_DAYS` | | The number of days to use cached layers before expiring them. Defaults to 7 days. |
273+
| `DOCKER_CONFIG_BASE64` | | The base64 encoded Docker config file that will be used to pull images from private container registries. |
274+
| `FALLBACK_IMAGE` | | Specifies an alternative image to use when neither an image is declared in the devcontainer.json file nor a Dockerfile is present. If there's a build failure (from a faulty Dockerfile) or a misconfiguration, this image will be the substitute. Set ExitOnBuildFailure to true to halt the container if the build faces an issue. |
275+
| `EXIT_ON_BUILD_FAILURE` | | Terminates the container upon a build failure. This is handy when preferring the FALLBACK_IMAGE in cases where no devcontainer.json or image is provided. However, it ensures that the container stops if the build process encounters an error. |
276+
| `FORCE_SAFE` | | Ignores any filesystem safety checks. This could cause serious harm to your system! This is used in cases where bypass is needed to unblock customers. |
277+
| `INSECURE` | | Bypass TLS verification when cloning and pulling from container registries. |
278+
| `IGNORE_PATHS` | `/var/run` | The comma separated list of paths to ignore when building the workspace. |
279+
| `SKIP_REBUILD` | | Skip building if the MagicFile exists. This is used to skip building when a container is restarting. e.g. docker stop -> docker start This value can always be set to true - even if the container is being started for the first time. |
280+
| `GIT_URL` | | The URL of the Git repository to clone. This is optional. |
281+
| `GIT_CLONE_DEPTH` | | The depth to use when cloning the Git repository. |
282+
| `GIT_CLONE_SINGLE_BRANCH` | | Clone only a single branch of the Git repository. |
283+
| `GIT_USERNAME` | | The username to use for Git authentication. This is optional. |
284+
| `GIT_PASSWORD` | | The password to use for Git authentication. This is optional. |
285+
| `GIT_HTTP_PROXY_URL` | | The URL for the HTTP proxy. This is optional. |
286+
| `WORKSPACE_FOLDER` | | The path to the workspace folder that will be built. This is optional. |
287+
| `SSL_CERT_BASE64` | | The content of an SSL cert file. This is useful for self-signed certificates. |
288+
| `EXPORT_ENV_FILE` | | Optional file path to a .env file where envbuilder will dump environment variables from devcontainer.json and the built container image. |
289+
| `POST_START_SCRIPT_PATH` | | The path to a script that will be created by envbuilder based on the postStartCommand in devcontainer.json, if any is specified (otherwise the script is not created). If this is set, the specified InitCommand should check for the presence of this script and execute it after successful startup. |
290290
<!--- END docsgen --->

‎options.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (o *Options) CLI() serpent.OptionSet {
5353
Value: serpent.StringOf(&o.SetupScript),
5454
Description: "The script to run before the init script. It runs as " +
5555
"the root user regardless of the user specified in the devcontainer.json " +
56-
"file.\n\nSetupScript is ran as the root user prior to the init script. " +
56+
"file. SetupScript is ran as the root user prior to the init script. " +
5757
"It is used to configure envbuilder dynamically during the runtime. e.g. " +
5858
"specifying whether to start systemd or tiny init for PID 1.",
5959
},
@@ -279,7 +279,12 @@ func (o *Options) Markdown() string {
279279
"| - | - | - |\n"
280280

281281
for _, opt := range cliOptions {
282-
mkd += "| " + opt.Env + " | " + opt.Default + " | " + opt.Description + " |\n"
282+
d := opt.Default
283+
if d != "" {
284+
285+
d = "`" + d + "`"
286+
}
287+
mkd += "| `" + opt.Env + "` | " + d + " | " + opt.Description + " |\n"
283288
}
284289

285290
return mkd

0 commit comments

Comments
 (0)