Commit e99d3165 authored by Bertrand Goareguer's avatar Bertrand Goareguer Committed by Cédric OLIVIER
Browse files

fix: Add registry name in all Docker images

parent 7973998e

README.md

+4 −4
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ The Terraform template uses some global configuration used throughout all jobs. 


| Name                     | description                            | default value     |

| ------------------------ | -------------------------------------- | ----------------- |

| `TF_IMAGE`               | the Docker image used to run Terraform CLI commands <br/>:warning: **set the version required by your project** | `hashicorp/terraform:light` |

| `TF_IMAGE`               | the Docker image used to run Terraform CLI commands <br/>:warning: **set the version required by your project** | `registry.hub.docker.com/hashicorp/terraform:light` |

| `TF_GITLAB_BACKEND_DISABLED`| Set to `true` to disable [GitLab managed Terraform State](https://docs.gitlab.com/ee/user/infrastructure/terraform_state.html) | _none_ (enabled) |

| `TF_PROJECT_DIR`         | Terraform project root directory        | `.`               |

| `TF_SCRIPTS_DIR`         | Terraform (hook) scripts base directory (relative to `$TF_PROJECT_DIR`) | `.` |
@@ -393,7 +393,7 @@ In addition to a textual report in the console, this job produces the following 


| Name                  | description                              | default value     |

| --------------------- | ---------------------------------------- | ----------------- |

| `TF_TFSEC_IMAGE`      | the Docker image used to run tfsec       | `aquasec/tfsec-ci`  |

| `TF_TFSEC_IMAGE`      | the Docker image used to run tfsec       | `registry.hub.docker.com/aquasec/tfsec-ci`  |

| `TF_TFSEC_ENABLED`    | Set to `true` to enable tfsec            | _none_ (disabled) |

| `TF_TFSEC_ARGS`       | tfsec [options and args](https://aquasecurity.github.io/tfsec/latest/guides/usage/) | `.` |
@@ -410,7 +410,7 @@ In addition to a textual report in the console, this job produces the following 


| Name                 | description                                                                                | default value        |

| -------------------- | ------------------------------------------------------------------------------------------ | -------------------- |

| `TF_CHECKOV_IMAGE`   | the Docker image used to run checkov                                                       | `bridgecrew/checkov` |

| `TF_CHECKOV_IMAGE`   | the Docker image used to run checkov                                                       | `registry.hub.docker.com/bridgecrew/checkov` |

| `TF_CHECKOV_ENABLED` | Set to `true` to enable checkov                                                            | _none_ (disabled)    |

| `TF_CHECKOV_ARGS`    | checkov [options and args](https://www.checkov.io/2.Basics/CLI%20Command%20Reference.html) | `--directory .`      |
@@ -440,7 +440,7 @@ resource "aws_s3_bucket" "foo-bucket" { 
| Name                   | description                   | default value         |

| ---------------------- | ----------------------------- | --------------------- |

| `TF_INFRACOST_ENABLED` | Set to `true` to enable infracost       | _none_ (disabled)     |

| `TF_INFRACOST_IMAGE`   | the infracost container image | `infracost/infracost` |

| `TF_INFRACOST_IMAGE`   | the infracost container image | `registry.hub.docker.com/infracost/infracost` |

| `TF_INFRACOST_ARGS`    | infracost [CLI options and args](https://www.infracost.io/docs/#usage) | `breakdown`           |

| `TF_INFACOST_USAGE_FILE` | infracost [usage file](https://www.infracost.io/docs/usage_based_resources/#infracost-usage-file) | `infracost-usage.yml` |

| :lock: `INFRACOST_API_KEY`| the infracost API key | **required** |

kicker.json

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    {

      "name": "TF_IMAGE",

      "description": "the Docker image used to run Terraform CLI commands - **set the version required by your project**",

      "default": "hashicorp/terraform:light"

      "default": "registry.hub.docker.com/hashicorp/terraform:light"

    },

    {

      "name": "TF_GITLAB_BACKEND_DISABLED",
@@ -69,7 +69,7 @@ 
        {

          "name": "TF_TFSEC_IMAGE",

          "description": "tfsec docker image",

          "default": "aquasec/tfsec-ci",

          "default": "registry.hub.docker.com/aquasec/tfsec-ci",

          "advanced": true

        },

        {
@@ -88,7 +88,7 @@ 
        {

          "name": "TF_CHECKOV_IMAGE",

          "description": "checkov docker image",

          "default": "bridgecrew/checkov",

          "default": "registry.hub.docker.com/bridgecrew/checkov",

          "advanced": true

        },

        {
@@ -108,7 +108,7 @@ 
        {

          "name": "TF_INFRACOST_IMAGE",

          "description": "Infracost docker image",

          "default": "infracost/infracost",

          "default": "registry.hub.docker.com/infracost/infracost",

          "advanced": true

        },

        {

templates/gitlab-ci-terraform.yml

+4 −4
Original line number Diff line number Diff line
@@ -45,14 +45,14 @@ variables: 
  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  # Default Docker image (can be overridden)

  TF_IMAGE: "hashicorp/terraform:light"

  TF_TFSEC_IMAGE: "aquasec/tfsec-ci"

  TF_IMAGE: "registry.hub.docker.com/hashicorp/terraform:light"

  TF_TFSEC_IMAGE: "registry.hub.docker.com/aquasec/tfsec-ci"

  TF_TFSEC_ARGS: "."

  TF_TFLINT_IMAGE: "ghcr.io/terraform-linters/tflint-bundle:latest"

  TF_TFLINT_ARGS: "--enable-plugin=google --enable-plugin=azurerm --enable-plugin=aws"

  TF_CHECKOV_IMAGE: "bridgecrew/checkov"

  TF_CHECKOV_IMAGE: "registry.hub.docker.com/bridgecrew/checkov"

  TF_CHECKOV_ARGS: "--framework terraform --directory ."

  TF_INFRACOST_IMAGE: "infracost/infracost"

  TF_INFRACOST_IMAGE: "registry.hub.docker.com/infracost/infracost"

  TF_INFRACOST_ARGS: "breakdown"

  TF_INFACOST_USAGE_FILE: "infracost-usage.yml"

  TF_FMT_ARGS: "-diff -recursive"