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

fix: "Add registry name in all Docker images"

parent 8e60229e

README.md

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ The sbt template uses some global configuration used throughout all jobs. 


| Name           | description                                                                                               | default value                                                                                                                                     |

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

| `SBT_IMAGE`    | The Docker image used to run sbt <br/>:warning: **set the version required by your project**              | `sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3`                                                                                                           |

| `SBT_IMAGE`    | The Docker image used to run sbt <br/>:warning: **set the version required by your project**              | `registry.hub.docker.com/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3`                                                                                                           |

| `SBT_OPTS`     | Global [sbt options](https://www.scala-sbt.org/1.x/docs/Command-Line-Reference.html#sbt+JVM+options+and+system+properties) | `-Dsbt.global.base=sbt-cache/sbtboot -Dsbt.boot.directory=sbt-cache/boot -Dsbt.coursier.home=sbt-cache/coursier -Dsbt.ci=true -Dsbt.color=always` |

| `SBT_CLI_OPTS` | Additional sbt options used on the command line                                                           | `--batch`                                                                                                                                         |
@@ -149,7 +149,7 @@ It is bound to the `test` stage, and uses the following variables: 
| Name                  | description                            | default value     |

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

| `SBT_SBOM_DISABLED` | Set to `true` to disable this job | _none_ |

| `SBT_SBOM_IMAGE` | The syft image used for SBOM analysis | `anchore/syft:debug` |

| `SBT_SBOM_IMAGE` | The syft image used for SBOM analysis | `registry.hub.docker.com/anchore/syft:debug` |

| `SBT_SBOM_OPTS` | Options for syft used for SBOM analysis | `dir:sbt-cache/coursier --catalogers java-cataloger` |



In addition to logs in the console, this job produces the following reports, kept for one week:

kicker.json

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

      "name": "SBT_IMAGE",

      "description": "The Docker image used to run sbt - **set the version required by your project**",

      "default": "sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3"

      "default": "registry.hub.docker.com/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3"

    },

    {

      "name": "SBT_BUILD_ARGS",
@@ -43,7 +43,7 @@ 
      "variables": [

        {

          "name": "SBT_SBOM_IMAGE",

          "default": "anchore/syft:debug",

          "default": "registry.hub.docker.com/anchore/syft:debug",

          "description": "The syft image used for SBOM analysis"

        },

        {

templates/gitlab-ci-sbt.yml

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



  # SBT image (can be overridden)

  SBT_IMAGE: "sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3"

  SBT_IMAGE: "registry.hub.docker.com/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3"



  # default production ref name (pattern)

  PROD_REF: '/^(master|main)$/'
@@ -66,7 +66,7 @@ variables: 
  SBT_CLI_OPTS: >-

    --batch



  SBT_SBOM_IMAGE: anchore/syft:debug

  SBT_SBOM_IMAGE: "registry.hub.docker.com/anchore/syft:debug"

  SBT_SBOM_OPTS: "dir:sbt-cache/coursier --catalogers java-cataloger"



stages: