Commit 2176d4e5 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch '11-add-registry-name-in-all-docker-images' into 'master' 

Resolve "Add registry name in all Docker images"

Closes #11

See merge request to-be-continuous/bash!25
parents 46792e0a aa380964

README.md

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ This job performs a static analysis of your shell scripts using [ShellCheck](htt 
| Name                    | description                            | default value     |

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

| `BASH_SHELLCHECK_DISABLED` | Set to `true` to disable ShellCheck                                                | _none_ (enabled) |

| `BASH_SHELLCHECK_IMAGE` | The Docker image used to run [ShellCheck](https://github.com/koalaman/shellcheck) | `koalaman/shellcheck-alpine:stable` |

| `BASH_SHELLCHECK_IMAGE` | The Docker image used to run [ShellCheck](https://github.com/koalaman/shellcheck) | `registry.hub.docker.com/koalaman/shellcheck-alpine:stable` |

| `BASH_SHELLCHECK_FILES` | Shell file(s) pattern to analyse                                                  | `**/*.sh`            |

| `BASH_SHELLCHECK_OPTS`  | ShellCheck [options](https://github.com/koalaman/shellcheck/blob/master/shellcheck.1.md) | _none_ |
@@ -35,7 +35,7 @@ The job uses the following variables: 
| Name                    | description                            | default value     |

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

| `BASH_BATS_ENABLED`     | Set to `true` to enable bats tests                                                    | _none_ (disabled) |

| `BASH_BATS_IMAGE`       | The Docker image used to run [Bats](https://hub.docker.com/r/bats/bats) | `bats/bats:latest` |

| `BASH_BATS_IMAGE`       | The Docker image used to run [Bats](https://hub.docker.com/r/bats/bats) | `registry.hub.docker.com/bats/bats:latest` |

| `BASH_BATS_TESTS`       | The path to a Bats test file, or the path to a directory containing Bats test files | `tests`           |

| `BASH_BATS_OPTS`        | Bats [options](https://bats-core.readthedocs.io/en/stable/usage.html)                | _none_ |

| `BASH_BATS_LIBRARIES`   | Coma separated list of Bats [libraries and add-ons](https://bats-core.readthedocs.io/en/stable/writing-tests.html#libraries-and-add-ons) (formatted as `lib_name_1@archive_url_1 lib_name_2@archive_url_2 ...`) | _none_ |

kicker.json

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

          "name": "BASH_SHELLCHECK_IMAGE",

          "description": "The Docker image used to run [ShellCheck](https://github.com/koalaman/shellcheck)",

          "default": "koalaman/shellcheck-alpine:stable",

          "default": "registry.hub.docker.com/koalaman/shellcheck-alpine:stable",

          "advanced": true

        },

        {
@@ -36,7 +36,7 @@ 
        {

          "name": "BASH_BATS_IMAGE",

          "description": "The Docker image used to run [Bats](https://hub.docker.com/r/bats/bats)",

          "default": "bats/bats:latest",

          "default": "registry.hub.docker.com/bats/bats:latest",

          "advanced": true

        },

        {

templates/gitlab-ci-bash.yml

+2 −2
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ variables: 
  # variabilized tracking image

  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  BASH_BATS_IMAGE: "bats/bats:latest"

  BASH_BATS_IMAGE: "registry.hub.docker.com/bats/bats:latest"

  BASH_BATS_TESTS: "tests"



  BASH_SHELLCHECK_IMAGE: "koalaman/shellcheck-alpine:stable"

  BASH_SHELLCHECK_IMAGE: "registry.hub.docker.com/koalaman/shellcheck-alpine:stable"

  BASH_SHELLCHECK_FILES: "**/*.sh"



  # default production ref name (pattern)