diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 12:06:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-17 12:06:48 +0000 |
| commit | bd860c22f6a4b9473cbddd34a53eead8235a7ea1 (patch) | |
| tree | 3f955a56c2ac90497863da26902a42dba49f3466 /doc/topics | |
| parent | e567b4c2df7dc4085d213db029eff6b6fcde0152 (diff) | |
| download | gitlab-ce-bd860c22f6a4b9473cbddd34a53eead8235a7ea1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/autodevops/index.md | 6 | ||||
| -rw-r--r-- | doc/topics/autodevops/quick_start_guide.md | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 3ced926a530..ebeb5270884 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -752,14 +752,14 @@ In projects: 1. Activate the experimental `Dockerfile` syntax by adding the following to the top of the file: - ```Dockerfile + ```docker # syntax = docker/dockerfile:experimental ``` 1. To make secrets available in any `RUN $COMMAND` in the `Dockerfile`, mount the secret file and source it prior to running `$COMMAND`: - ```Dockerfile + ```docker RUN --mount=type=secret,id=auto-devops-build-secrets . /run/secrets/auto-devops-build-secrets && $COMMAND ``` @@ -1263,7 +1263,7 @@ curl --data "value=true" --header "PRIVATE-TOKEN: personal_access_token" https:/ [kubernetes-clusters]: ../../user/project/clusters/index.md [docker-in-docker]: ../../docker/using_docker_build.md#use-docker-in-docker-executor [review-app]: ../../ci/review_apps/index.md -[container-registry]: ../../user/project/container_registry.md +[container-registry]: ../../user/packages/container_registry/index.md [postgresql]: https://www.postgresql.org/ [Auto DevOps template]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml [ee]: https://about.gitlab.com/pricing/ diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md index 35a5aff6a60..d0ff149cf31 100644 --- a/doc/topics/autodevops/quick_start_guide.md +++ b/doc/topics/autodevops/quick_start_guide.md @@ -152,7 +152,7 @@ The pipeline is split into 4 stages, each running a couple of jobs.  In the **build** stage, the application is built into a Docker image and then -uploaded to your project's [Container Registry](../../user/project/container_registry.md) ([Auto Build](index.md#auto-build)). +uploaded to your project's [Container Registry](../../user/packages/container_registry/index.md) ([Auto Build](index.md#auto-build)). In the **test** stage, GitLab runs various checks on the application: |