diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:09:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-18 18:09:07 +0000 |
commit | 6b8d671de726534a03c18e025a586e1bc9c04a4f (patch) | |
tree | f6a9168160b0d435641a1767b2e68487ec75ae46 /doc/topics/autodevops/index.md | |
parent | 163a7046ac76eb4109184e82ce0af911633e6626 (diff) | |
download | gitlab-ce-6b8d671de726534a03c18e025a586e1bc9c04a4f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics/autodevops/index.md')
-rw-r--r-- | doc/topics/autodevops/index.md | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index dcd822705f9..aa210f3550f 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -918,12 +918,12 @@ instead of the default `ruby:latest`: 1. Set `AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS` to `--build-arg=RUBY_VERSION=alpine`. 1. Add the following to a custom `Dockerfile`: - ```docker - ARG RUBY_VERSION=latest - FROM ruby:$RUBY_VERSION + ```dockerfile + ARG RUBY_VERSION=latest + FROM ruby:$RUBY_VERSION - # ... put your stuff here - ``` + # ... put your stuff here + ``` NOTE: **Note:** Passing in complex values (newlines and spaces, for example) will likely @@ -955,14 +955,14 @@ In projects: 1. Activate the experimental `Dockerfile` syntax by adding the following to the top of the file: - ```docker + ```dockerfile # 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`: - ```docker + ```dockerfile RUN --mount=type=secret,id=auto-devops-build-secrets . /run/secrets/auto-devops-build-secrets && $COMMAND ``` |