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

fix: "Add registry name in all Docker images"

parent 17035c27

README.md

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ The Go template uses some global configuration used throughout all jobs. 


| Name             | description                                                                                                | default value   |

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

| `GO_IMAGE`       | The Docker image used to run Go for `go-build` <br/>:warning: **set the version required by your project** | `golang:buster` |

| `GO_IMAGE`       | The Docker image used to run Go for `go-build` <br/>:warning: **set the version required by your project** | `registry.hub.docker.com/library/golang:buster` |

| `GO_TEST_IMAGE`  | The Docker image used to run Go for `go-test` <br/>:warning: **set the version required by your project**  | _none_          |

| `GO_PROJECT_DIR` | Go project root directory                                                                                  | `.`             |

| `GOPROXY`        | URL of Go module proxy                                                                                     | _none_          |
@@ -51,8 +51,8 @@ Here is a `.gitlab-ci.yml` example that triggers a build on 3 target platforms u 


```yaml

variables:

  GO_IMAGE: "golang:1.17-buster"

  GO_TEST_IMAGE: "golang:1.17-buster"

  GO_IMAGE: "registry.hub.docker.com/library/golang:1.17-buster"

  GO_TEST_IMAGE: "registry.hub.docker.com/library/golang:1.17-buster"



go-build:

  parallel:
@@ -97,7 +97,7 @@ It is bound to the `build` stage, and uses the following variables: 


| Name                  | description                                                                                              | default value                          |

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

| `GO_CI_LINT_IMAGE`    | The Docker image used to run `golangci-lint`                                                             | `golangci/golangci-lint:latest-alpine` |

| `GO_CI_LINT_IMAGE`    | The Docker image used to run `golangci-lint`                                                             | `registry.hub.docker.com/golangci/golangci-lint:latest-alpine` |

| `GO_CI_LINT_ARGS`     | `golangci-lint` [command line arguments](https://github.com/golangci/golangci-lint#command-line-options) | `-E gosec,goimports ./...`             |

| `GO_CI_LINT_DISABLED` | Set to `true` to disable this job                                                                        | _none_(enabled)                        |
@@ -162,5 +162,5 @@ It is bound to the `test` stage, and uses the following variables: 
| Name                  | description                            | default value     |

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

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

| `GO_SBOM_IMAGE` | Image of cyclonedx-gomod used for SBOM analysis | cyclonedx/cyclonedx-gomod:latest |

| `GO_SBOM_IMAGE` | Image of cyclonedx-gomod used for SBOM analysis | `registry.hub.docker.com/cyclonedx/cyclonedx-gomod:latest` |

| `GO_SBOM_OPTS` | [@cyclonedx/cyclonedx-gomod options](https://github.com/CycloneDX/cyclonedx-gomod#usage) used for SBOM analysis | `--main .` |

kicker.json

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

      "name": "GO_IMAGE",

      "description": "The Docker image used to run Go (build+test or build only) - **set the version required by your project**",

      "default": "golang:buster"

      "default": "registry.hub.docker.com/library/golang:buster"

    },

    {

      "name": "GO_PROJECT_DIR",
@@ -92,7 +92,7 @@ 
        {

          "name": "GO_CI_LINT_IMAGE",

          "description": "The Docker image used to run `golangci-lint`",

          "default": "golangci/golangci-lint:latest-alpine"

          "default": "registry.hub.docker.com/golangci/golangci-lint:latest-alpine"

        },

        {

          "name": "GO_CI_LINT_ARGS",
@@ -125,7 +125,7 @@ 
        {

          "name": "GO_SBOM_IMAGE",

          "description": "Image of cyclonedx-gomod used for SBOM analysis",

          "default": "cyclonedx/cyclonedx-gomod:latest"

          "default": "registry.hub.docker.com/cyclonedx/cyclonedx-gomod:latest"

        },

        {

          "name": "GO_SBOM_OPTS",

templates/gitlab-ci-golang.yml

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ variables: 
  GO_PROJECT_DIR: .



  # Default Docker image (can be overridden)

  GO_IMAGE: "golang:buster"

  GO_IMAGE: "registry.hub.docker.com/library/golang:buster"



  # Default flags for 'build' command

  GO_BUILD_FLAGS: >-
@@ -86,13 +86,13 @@ variables: 
  GO_MOD_OUTDATED_ARGS: '-update -direct'



  # Default golangci-lint Docker image (can be overridden)

  GO_CI_LINT_IMAGE: "golangci/golangci-lint:latest-alpine"

  GO_CI_LINT_IMAGE: "registry.hub.docker.com/golangci/golangci-lint:latest-alpine"



  # Default arguments for golangci-lint command

  GO_CI_LINT_ARGS: '-E gosec,goimports ./...'



  # Image of cyclonedx-gomod used for SBOM analysis

  GO_SBOM_IMAGE: cyclonedx/cyclonedx-gomod:latest

  GO_SBOM_IMAGE: "registry.hub.docker.com/cyclonedx/cyclonedx-gomod:latest"

  # Options for cyclonedx-gomod used for SBOM analysis

  GO_SBOM_OPTS: "-main ."