Commit 5ea94193 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix: replace deprecated Docker Hub registry FQDN

parent 02844e75

README.md

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ include: 
  - component: $CI_SERVER_FQDN/to-be-continuous/sbt/gitlab-ci-sbt@1.8.2

    # 2: set/override component inputs

    inputs:

      image: "registry.hub.docker.com/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3" # ⚠ this is only an example

      image: "docker.io/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3" # ⚠ this is only an example

```



### Use as a CI/CD template (legacy)
@@ -40,7 +40,7 @@ include: 


variables:

  # 2: set/override template variables

  SBT_IMAGE: "registry.hub.docker.com/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3" # ⚠ this is only an example

  SBT_IMAGE: "docker.io/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3" # ⚠ this is only an example

```



## Project prerequisites
@@ -95,7 +95,7 @@ The sbt template uses some global configuration used throughout all jobs. 


| Input / Variable | Description                                                                                               | Default value                                                                                                                                     |

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

| `image` / `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`                                                                                                           <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-SBT_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-SBT_IMAGE) |

| `image` / `SBT_IMAGE` | The Docker image used to run sbt <br/>:warning: **set the version required by your project**              | `docker.io/sbtscala/scala-sbt:17.0.2_1.6.2_3.1.3`                                                                                                           <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-SBT_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-SBT_IMAGE) |

| `opts` / `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` |

| `cli-opts` / `SBT_CLI_OPTS` | Additional sbt options used on the command line                                                           | `--batch`                                                                                                                                         |
@@ -147,7 +147,7 @@ It is bound to the `test` stage, and uses the following variables: 
| --------------------- | -------------------------------------- | ----------------- |

| `sbom-disabled` / `SBT_SBOM_DISABLED` | Set to `true` to disable this job | _none_ |

| `TBC_SBOM_MODE`                       | Controls when SBOM reports are generated (`onrelease`: only on `$INTEG_REF`, `$PROD_REF` and `$RELEASE_REF` pipelines; `always`: any pipeline).<br/>:warning: `sbom-disabled` / `SBT_SBOM_DISABLED` takes precedence | `onrelease` |

| `sbom-image` / `SBT_SBOM_IMAGE` | The syft image used for SBOM analysis | `registry.hub.docker.com/anchore/syft:debug` <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-SBT_SBOM_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-SBT_SBOM_IMAGE) |

| `sbom-image` / `SBT_SBOM_IMAGE` | The syft image used for SBOM analysis | `docker.io/anchore/syft:debug` <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-SBT_SBOM_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-SBT_SBOM_IMAGE) |

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



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
@@ -9,7 +9,7 @@ 
    {

      "name": "SBT_IMAGE",

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

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

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

    },

    {

      "name": "SBT_BUILD_ARGS",
@@ -53,7 +53,7 @@ 
        },

        {

          "name": "SBT_SBOM_IMAGE",

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

          "default": "docker.io/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
@@ -18,7 +18,7 @@ spec: 
  inputs:

    image:

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

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

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

    build-args:

      description: The sbt arguments for the sbt arguments for the [build job packaging](https://www.scala-sbt.org/1.x/docs/Running.html#Common+commands)

      default: clean package
@@ -37,7 +37,7 @@ spec: 
      default: false

    sbom-image:

      description: The syft image used for SBOM analysis

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

      default: docker.io/anchore/syft:debug

    sbom-opts:

      description: Options for syft used for SBOM analysis

      default: dir:sbt-cache/coursier --catalogers java-cataloger --select-catalogers -file