diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-10-19 10:59:39 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-10-19 10:59:39 +0000 |
| commit | e2b8337f12a45219548c37287e3929e751e4704d (patch) | |
| tree | 35e566becf1b82ec8a010c2ed1a2839f85968f2c | |
| parent | 2620974cdfb482905bec3001af1b76160624f198 (diff) | |
| parent | 08a38b71b7035f477a9ecc273ff8bd0301eb4a21 (diff) | |
| download | gitlab-ce-e2b8337f12a45219548c37287e3929e751e4704d.tar.gz | |
Merge branch 'doc-edit-config-file-path-kaniko' into 'master'
Docs: Change path where to create the config.json file when using kaniko
See merge request gitlab-org/gitlab-ce!22075
| -rw-r--r-- | doc/ci/docker/using_kaniko.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/ci/docker/using_kaniko.md b/doc/ci/docker/using_kaniko.md index 7d4f28e1f47..66f0d429165 100644 --- a/doc/ci/docker/using_kaniko.md +++ b/doc/ci/docker/using_kaniko.md @@ -39,7 +39,7 @@ few important details: In the following example, kaniko is used to build a Docker image and then push it to [GitLab Container Registry](../../user/project/container_registry.md). The job will run only when a tag is pushed. A `config.json` file is created under -`/root/.docker` with the needed GitLab Container Registry credentials taken from the +`/kaniko/.docker` with the needed GitLab Container Registry credentials taken from the [environment variables](../variables/README.md#predefined-variables-environment-variables) GitLab CI/CD provides. In the last step, kaniko uses the `Dockerfile` under the root directory of the project, builds the Docker image and pushes it to the @@ -52,8 +52,7 @@ build: name: gcr.io/kaniko-project/executor:debug entrypoint: [""] script: - - mkdir -p /root/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /root/.docker/config.json + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG only: - tags |