diff --git a/Dockerfile b/Dockerfile index 88afff8..6a61202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,6 @@ RUN mkdir -p /root/.terraform.d/plugins/registry.terraform.io/hashicorp/random/3 rm -f /tmp/random.zip ENV TF_PLUGIN_CACHE_DIR=/root/.terraform.d/plugins -ENV TERRAGRUNT_TFPATH=/usr/local/bin/terraform +ENV TG_TF_PATH=/usr/local/bin/terraform WORKDIR /workspace diff --git a/scripts/generate-pipeline.sh b/scripts/generate-pipeline.sh index 013637b..5796b09 100755 --- a/scripts/generate-pipeline.sh +++ b/scripts/generate-pipeline.sh @@ -75,11 +75,11 @@ validate-${job_prefix}: S3_ACCESS_KEY: "\${S3_ACCESS_KEY}" S3_SECRET_KEY: "\${S3_SECRET_KEY}" S3_STATE_BUCKET: "\${S3_STATE_BUCKET}" - TERRAGRUNT_TFPATH: "/usr/local/bin/terraform" + TG_TF_PATH: "/usr/local/bin/terraform" before_script: - cd \${TG_ROOT} script: - - terragrunt init -reconfigure -input=false --terragrunt-non-interactive + - terragrunt init -reconfigure --terragrunt-non-interactive - terragrunt validate-inputs --terragrunt-non-interactive - terragrunt validate --terragrunt-non-interactive rules: @@ -103,12 +103,12 @@ plan-${job_prefix}: S3_ACCESS_KEY: "\${S3_ACCESS_KEY}" S3_SECRET_KEY: "\${S3_SECRET_KEY}" S3_STATE_BUCKET: "\${S3_STATE_BUCKET}" - TERRAGRUNT_TFPATH: "/usr/local/bin/terraform" + TG_TF_PATH: "/usr/local/bin/terraform" before_script: - cd \${TG_ROOT} script: - - terragrunt init -reconfigure -input=false --terragrunt-non-interactive - - terragrunt plan -input=false --terragrunt-non-interactive -out=tfplan + - terragrunt init -reconfigure --terragrunt-non-interactive + - terragrunt plan --terragrunt-non-interactive -out=tfplan rules: - if: '\$CI_COMMIT_BRANCH == "master" || \$CI_COMMIT_BRANCH == "main"' - if: '\$CI_PIPELINE_SOURCE == "merge_request_event"' @@ -142,12 +142,12 @@ apply-${job_prefix}: S3_ACCESS_KEY: "\${S3_ACCESS_KEY}" S3_SECRET_KEY: "\${S3_SECRET_KEY}" S3_STATE_BUCKET: "\${S3_STATE_BUCKET}" - TERRAGRUNT_TFPATH: "/usr/local/bin/terraform" + TG_TF_PATH: "/usr/local/bin/terraform" before_script: - cd \${TG_ROOT} script: - - terragrunt init -reconfigure -input=false --terragrunt-non-interactive - - terragrunt apply -input=false --terragrunt-non-interactive tfplan + - terragrunt init -reconfigure --terragrunt-non-interactive + - terragrunt apply --terragrunt-non-interactive tfplan rules: - if: '\$CI_COMMIT_BRANCH == "master" || \$CI_COMMIT_BRANCH == "main"' when: ${when_clause}