- Notifications
You must be signed in to change notification settings - Fork928
chore(examples): update devcontainer-docker template#14199
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Changes from1 commit
e40dd7a3f37703b74e9841ea88ab08c04ea40e4e12File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -93,14 +93,13 @@ EOF | ||
| variable "cache_repo" { | ||
| default = "" | ||
| description = "(Optional) Use a container registry as a cache to speed up builds." | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. review: this shouldn't contain any credentials and it's kind of annoying to have this sensitive | ||
| type = string | ||
| } | ||
| variable "cache_repo_docker_config_path" { | ||
| default = "" | ||
| description = "(Optional)Path to a docker config.json containing credentials to the provided cache repo, if required." | ||
| sensitive = true | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Is this actually sensitive if it's just the path to a file? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. 🤷 maybe? The nice thing about making the file sensitive is that the content automatically becomes sensitive. (That's my recollection anyhow) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Ok, so there’s some magic there wrt content? If so please keep it as is 👍 | ||
| type = string | ||
| } | ||
| @@ -152,15 +151,15 @@ resource "docker_volume" "workspaces" { | ||
| # Check for the presence of a prebuilt image in the cache repo | ||
| # that we can use instead. | ||
| resource "envbuilder_cached_image" "cached" { | ||
| count =var.cache_repo == "" ? 0 :data.coder_workspace.me.start_count | ||
| builder_image = local.devcontainer_builder_image | ||
| git_url = local.repo_url | ||
| cache_repo = var.cache_repo | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Should we make these optional and let them be provided via extra env too? Would simplify a bit and a user knows they can just cram everything in extra. Right now for url is given here and in extra, what if the values differ? What's the behavior? (IMO maybe it's an error). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Alternatively, we could validate at runtime that There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I agree, that’s what I had in mind, but in a more roundabout way 😅. I think it would help with avoiding mistakes, and remove ambiguity. | ||
| } | ||
| resource "docker_container" "workspace" { | ||
| count = data.coder_workspace.me.start_count | ||
| image =var.cache_repo == "" ? local.devcontainer_builder_image :envbuilder_cached_image.cached.0.image | ||
| # Uses lower() to avoid Docker restriction on container names. | ||
| name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}" | ||
| # Hostname makes the shell more user friendly: coder@my-workspace:~$ | ||
| @@ -174,10 +173,10 @@ resource "docker_container" "workspace" { | ||
| "ENVBUILDER_FALLBACK_IMAGE=${data.coder_parameter.fallback_image.value}", | ||
| "ENVBUILDER_CACHE_REPO=${var.cache_repo}", | ||
| "ENVBUILDER_DOCKER_CONFIG_BASE64=${try(data.local_sensitive_file.cache_repo_dockerconfigjson[0].content_base64, "")}", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Should this also be passed to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. oop, forgot about the env 👍 MemberAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. OK, I took a stab at this -- unfortunately there's abug in the provider that mangles the init script. I can remove the FIXME after this is done though. | ||
| "ENVBUILDER_PUSH_IMAGE=${var.cache_repo== "" ? "" : "true"}", | ||
| #"ENVBUILDER_INSECURE=true", # Uncomment if testing with a registry running on `localhost`. | ||
| ] | ||
| # network_mode = "host" # Uncomment if testing with a registry running on `localhost`. | ||
| host { | ||
| host = "host.docker.internal" | ||
| ip = "host-gateway" | ||
| @@ -314,3 +313,20 @@ resource "coder_app" "code-server" { | ||
| threshold = 6 | ||
| } | ||
| } | ||
| resource "coder_metadata" "container_info" { | ||
| count = data.coder_workspace.me.start_count | ||
| resource_id = docker_container.workspace.0.id | ||
| item { | ||
| key = "workspace image" | ||
| value = var.cache_repo == "" ? local.devcontainer_builder_image : envbuilder_cached_image.cached.0.image | ||
| } | ||
| item { | ||
| key = "git url" | ||
| value = local.repo_url | ||
| } | ||
| item { | ||
| key = "cache repo" | ||
| value = var.cache_repo == "" ? "not enabled" : var.cache_repo | ||
| } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Nice addition ❤️ | ||
| } | ||
Uh oh!
There was an error while loading.Please reload this page.