Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add disk_path to docker compose #135

Merged
merged 4 commits into from
Nov 15, 2023
Merged

add disk_path to docker compose #135

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e76f2b1
add disk_path to docker compose
Nov 15, 2023
81f04aa
var desc
Nov 15, 2023
72b000f
bind mount disk_path
Nov 15, 2023
4e752e4
remove TFE_DISK_PATH
Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions modules/docker_compose_config/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ locals {
HTTPS_PROXY = var.https_proxy != null ? "http://${var.https_proxy}" : null
no_proxy = var.no_proxy != null ? join(",", var.no_proxy) : null
NO_PROXY = var.no_proxy != null ? join(",", var.no_proxy) : null
TFE_DISK_PATH = var.disk_path
anniehedgpeth marked this conversation as resolved.
Show resolved Hide resolved
TFE_HOSTNAME = var.hostname
TFE_HTTP_PORT = var.http_port
TFE_HTTPS_PORT = var.https_port
Expand Down Expand Up @@ -78,8 +79,8 @@ locals {
target = "/var/cache/tfe-task-worker/terraform"
},
local.disk ? [{
type = "volume"
source = "terraform-enterprise"
type = "bind"
source = var.disk_path
target = "/var/lib/terraform-enterprise"
}] : [],
])
Expand Down
6 changes: 6 additions & 0 deletions modules/docker_compose_config/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ variable "database_user" {
description = "PostgreSQL user. Required when TFE_OPERATIONAL_MODE is external or active-active."
}

variable "disk_path" {
default = null
description = "The pathname of the directory in which Terraform Enterprise will store data in Mounted Disk mode. Required when var.operational_mode is 'disk'."
type = string
}

variable "http_port" {
default = null
type = number
Expand Down
Loading