remove merlinn_release

vespperhq · Jul 25, 2024 · 15a1ffd · 15a1ffd
1 parent 4d566f0
commit 15a1ffd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,8 @@ config/litellm/.env
 # Terraform & Deployment files
 .terraform
 .terraform.lock.hcl
+.terraform.tfstate.lock.info
 terraform.tfstate
+terraform.tfstate.backup
 merlinn-aws
 merlinn-aws.pub
diff --git a/examples/deployments/aws-terraform/startup.sh b/examples/deployments/aws-terraform/startup.sh
@@ -18,7 +18,4 @@ apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin do
 usermod -aG docker ubuntu
 git clone https://github.com/merlinn-co/merlinn.git && cd merlinn
 
-# git fetch --tags
-# git checkout tags/${merlinn_release} # in the future, we can use a specific release of Merlinn
-
 docker compose up -d --build
diff --git a/examples/deployments/aws-terraform/variables.tf b/examples/deployments/aws-terraform/variables.tf
@@ -1,9 +1,3 @@
-# variable "merlinn_release" {
-#   description = "The merlinn release to deploy"
-#   type        = string
-#   default     = "0.4.12"
-# }
-
 data "http" "startup_script_remote" {
   url = "https://raw.githubusercontent.com/merlinn-co/merlinn/terraform-deploy/examples/deployments/aws-terraform/startup.sh"
 }
@@ -70,7 +64,7 @@ variable "merlinn_data_volume_snapshot_before_destroy" {
 variable "merlinn_data_restore_from_snapshot_id" {
     description = "Restore the merlinn data volume from a snapshot"
     type        = string
-    default     = null
+    default     = ""
 }
 
 variable "merlinn_port" {