Merge branch 'fix/remove_validate'

glennbechdevops · Nov 14, 2022 · 48ea95c · 48ea95c
2 parents 1fe2851 + ca01a0b
commit 48ea95c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
@@ -38,6 +38,8 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_REGION: eu-west-1
+      IMAGE: 244530008913.dkr.ecr.eu-west-1.amazonaws.com/glenn:latest
+      PREFIX: glennbech3
  #    TF_LOG: trace
     steps:
       - uses: actions/checkout@v3
@@ -50,7 +52,7 @@ jobs:
 
       - name: Terraform Plan
         id: plan
-        run: terraform plan   -var="prefix=glennbech"  -no-color
+        run: terraform plan   -var="prefix=$PREFIX" -var="image=$IMAGE"  -no-color
         continue-on-error: true
 
       - name: Terraform Plan Status
@@ -59,4 +61,4 @@ jobs:
 
       - name: Terraform Apply
         if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-        run: terraform apply -var="prefix=glennbech"  -auto-approve
+        run: terraform apply -var="prefix=$PREFIX" -var="image=$IMAGE"  -auto-approve
diff --git a/variables.tf b/variables.tf
@@ -4,5 +4,5 @@ variable "prefix" {
 
 variable "image" {
   type = string
-  default = "244530008913.dkr.ecr.eu-west-1.amazonaws.com/glenn:latest"
+
 }