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

Merge branch 'feat/component' into 'master'

feat: migrate to GitLab CI/CD component

See merge request to-be-continuous/docker!97
parents b8b40b73 60f2c3f6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ include:
    file: '/templates/validation.yml'
  - project: 'to-be-continuous/bash'
    ref: '3.3'
    file: 'templates/gitlab-ci-bash.yml'
    file: '/templates/gitlab-ci-bash.yml'
  - project: 'to-be-continuous/semantic-release'
    ref: '3.7'
    file: '/templates/gitlab-ci-semrel.yml'    
+149 −144

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ if [[ "$curVer" ]]; then
  log_info "Bump version from \\e[33;1m${curVer}\\e[0m to \\e[33;1m${nextVer}\\e[0m (release type: $relType)..."

  # replace in README
  sed -e "s/ref: '$curVer'/ref: '$nextVer'/" README.md > README.md.next
  sed -e "s/ref: *'$curVer'/ref: '$nextVer'/" -e "s/ref: *\"$curVer\”/ref: \”$nextVer\”/" -e "s/component: *\(.*\)@$curVer/component: \1@$nextVer/" README.md > README.md.next
  mv -f README.md.next README.md

  # replace in template and variants
  for tmpl in templates/*.yml
  do
    sed -e "s/\"$curVer\"/\"$nextVer\"/" "$tmpl" > "$tmpl.next"
    sed -e "s/command: *\[\"--service\", \"\(.*\)\", \"$curVer\"\]/command: [\"--service\", \"\1\", \"$nextVer\"]/" "$tmpl" > "$tmpl.next"
    mv -f "$tmpl.next" "$tmpl"
  done
else
+15 −7
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@
  "description": "Build, check and inspect your containers with [Docker](https://www.docker.com/)",
  "template_path": "templates/gitlab-ci-docker.yml",
  "kind": "package",
  "prefix": "docker",
  "is_component": true,
  "variables": [
    {
      "name": "DOCKER_BUILD_TOOL",
@@ -39,7 +41,7 @@
    {
      "name": "DOCKER_FILE",
      "description": "The path to your `Dockerfile`",
      "default": "$CI_PROJECT_DIR/Dockerfile"
      "default": "Dockerfile"
    },
    {
      "name": "DOCKER_CONTEXT_PATH",
@@ -265,6 +267,12 @@
          "default": "registry.gitlab.com/to-be-continuous/tools/gcp-auth-provider:main",
          "advanced": true
        },
        {
          "name": "GCP_OIDC_AUD",
          "description": "The `aud` claim for the JWT token _(only required for [OIDC authentication](https://docs.gitlab.com/ee/ci/cloud_services/aws/))_",
          "default": "$CI_SERVER_URL",
          "advanced": true
        },
        {
          "name": "GCP_OIDC_ACCOUNT",
          "description": "Default Service Account to which impersonate with OpenID Connect authentication"
@@ -275,22 +283,22 @@
        },
        {
          "name": "GCP_SNAPSHOT_OIDC_ACCOUNT",
          "description": "Service Account to use to push the snapshot image _(only define if different from default)_",
          "description": "Service Account to use to push the snapshot image _(only define to override default)_",
          "advanced": true
        },
        {
          "name": "GCP_SNAPSHOT_OIDC_PROVIDER",
          "description": "Workload Identity Provider to push the snapshot image _(only define if different from default)_",
          "description": "Workload Identity Provider to push the snapshot image _(only define to override default)_",
          "advanced": true
        },
        {
          "name": "GCP_RELEASE_OIDC_ACCOUNT",
          "description": "Service Account to use to push the release image _(only define if different from default)_",
          "description": "Service Account to use to push the release image _(only define to override default)_",
          "advanced": true
        },
        {
          "name": "GCP_RELEASE_OIDC_PROVIDER",
          "description": "Workload Identity Provider to push the release image _(only define if different from default)_",
          "description": "Workload Identity Provider to push the release image _(only define to override default)_",
          "advanced": true
        }
      ]
@@ -313,12 +321,12 @@
        },
        {
          "name": "AWS_SNAPSHOT_REGION",
          "description": "Region of the ECR registry for the snapshot image _(only define if different from default)_",
          "description": "Region of the ECR registry for the snapshot image _(only define to override default)_",
          "advanced": true
        },
        {
          "name": "AWS_RELEASE_REGION",
          "description": "Region of the ECR registry for the release image _(only define if different from default)_",
          "description": "Region of the ECR registry for the release image _(only define to override default)_",
          "advanced": true
        },
        {
−5.57 KiB (16.5 KiB)
Loading image diff...
Loading