Merge branch 'main' of https://gitea.nicholaspease.com/npease/CoderTemplatesV2
Merge new and old
This commit is contained in:
+2
-4
@@ -93,8 +93,6 @@ resource "coder_agent" "main" {
|
||||
echo "[settings]" >> ~/.wakatime.cfg && echo "api_url = ${var.waka_api_url}" >> ~/.wakatime.cfg && echo "api_key = ${var.waka_api_key}" >> ~/.wakatime.cfg
|
||||
# Clone Git Repo
|
||||
cd ~/
|
||||
# Specific Extensions
|
||||
code-server --install-extension ms-vscode.cpptools-extension-pack
|
||||
|
||||
if [ "${data.coder_parameter.git_repo.value}" != " " ] && [ ! -d "${data.coder_workspace.me.name}" ]
|
||||
then
|
||||
@@ -145,13 +143,13 @@ resource "docker_volume" "home_volume" {
|
||||
resource "docker_image" "main" {
|
||||
name = "coder-${data.coder_workspace.me.id}"
|
||||
build {
|
||||
context = "./${data.coder_parameter.language.value}/build"
|
||||
context = "./dockerfiles/${data.coder_parameter.language.value}"
|
||||
build_args = {
|
||||
USER = local.username
|
||||
}
|
||||
}
|
||||
triggers = {
|
||||
dir_sha1 = sha1(join("", [for f in fileset(path.module, "build/${data.coder_parameter.language.value}/*") : filesha1(f)]))
|
||||
dir_sha1 = sha1(join("", [for f in fileset(path.module, "dockerfiles/${data.coder_parameter.language.value}/*") : filesha1(f)]))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user