From f39e040ef23db7e404fce92a17bc1e09ab900904 Mon Sep 17 00:00:00 2001
From: Work <work@ehs-MacBook-Pro.local>
Date: Mon, 26 Jan 2026 14:16:14 +0300
Subject: [PATCH] change pipeline generation + add tf dockerfile

---
 live/terragrunt.hcl          |  2 ++
 scripts/generate-pipeline.sh | 28 ++++++++++++----------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/live/terragrunt.hcl b/live/terragrunt.hcl
index 678372e..799a0b0 100644
--- a/live/terragrunt.hcl
+++ b/live/terragrunt.hcl
@@ -9,6 +9,8 @@ remote_state {
     bucket                      = "tfstate-terragrunt-stage"
     key                         = "${path_relative_to_include()}/terraform.tfstate"
     region                      = "ru-central1"
+    access_key                  = get_env("S3_ACCESS_KEY", get_env("AWS_ACCESS_KEY_ID", ""))
+    secret_key                  = get_env("S3_SECRET_KEY", get_env("AWS_SECRET_ACCESS_KEY", ""))
     skip_region_validation      = true
     skip_credentials_validation = true
     skip_metadata_api_check     = true
diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh
index cfba71b..2255f58 100755
--- a/scripts/generate-pipeline.sh
+++ b/scripts/generate-pipeline.sh
@@ -84,14 +84,12 @@ validate-${job_prefix}:
   before_script:
     - echo "${S3_ACCESS_KEY}"
     - echo "${S3_SECRET_KEY}"
-    - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}"
-    - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}"
-    - export AWS_ACCESS_KEY_ID="\${AWS_ACCESS_KEY_ID}"
-    - export AWS_SECRET_ACCESS_KEY="\${AWS_SECRET_ACCESS_KEY}"
+    - export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}"
+    - export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}"
     - cd \${TG_ROOT}
     - rm -rf .terragrunt-cache
   script:
-    - terragrunt init --migrate-state
+    - terragrunt init -reconfigure
     - terragrunt validate-inputs
     - terragrunt validate
   rules:
@@ -119,14 +117,14 @@ plan-${job_prefix}:
     AWS_ACCESS_KEY_ID: "\${AWS_ACCESS_KEY_ID}"
     AWS_SECRET_ACCESS_KEY: "\${AWS_SECRET_ACCESS_KEY}"
   before_script:
-    - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}"
-    - export S3_SECRET_KEY="\${S3_SECRET_KEY}"
-    - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}"
-    - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}"
+    - echo "${S3_ACCESS_KEY}"
+    - echo "${S3_SECRET_KEY}"
+    - export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}"
+    - export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}"
     - cd \${TG_ROOT}
     - rm -rf .terragrunt-cache
   script:
-    - terragrunt init --migrate-state
+    - terragrunt init -reconfigure
     - terragrunt plan -out=tfplan
   rules:
     - if: '\$CI_COMMIT_BRANCH == "master" || \$CI_COMMIT_BRANCH == "main"'
@@ -165,12 +163,10 @@ apply-${job_prefix}:
     AWS_ACCESS_KEY_ID: "\${AWS_ACCESS_KEY_ID}"
     AWS_SECRET_ACCESS_KEY: "\${AWS_SECRET_ACCESS_KEY}"
   before_script:
-    - export S3_ACCESS_KEY="\${S3_ACCESS_KEY}"
-    - export S3_SECRET_KEY="\${S3_SECRET_KEY}"
-    - export AWS_ACCESS_KEY_ID="\${S3_ACCESS_KEY}"
-    - export AWS_SECRET_ACCESS_KEY="\${S3_SECRET_KEY}"
-    - export AWS_ACCESS_KEY_ID="\${AWS_ACCESS_KEY_ID}"
-    - export AWS_SECRET_ACCESS_KEY="\${AWS_SECRET_ACCESS_KEY}"
+   - echo "${S3_ACCESS_KEY}"
+    - echo "${S3_SECRET_KEY}"
+    - export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}"
+    - export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}"
     - cd \${TG_ROOT}
     - rm -rf .terragrunt-cache
   script: