Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
207642fb
Commit
207642fb
authored
Sep 10, 2018
by
Cam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct YAML indentation
parent
30227f8e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
doc/ci/docker/using_docker_build.md
doc/ci/docker/using_docker_build.md
+13
-13
No files found.
doc/ci/docker/using_docker_build.md
View file @
207642fb
...
@@ -151,16 +151,16 @@ In order to do that, follow the steps:
...
@@ -151,16 +151,16 @@ In order to do that, follow the steps:
DOCKER_DRIVER: overlay2
DOCKER_DRIVER: overlay2
services:
services:
- docker:dind
- docker:dind
before_script:
before_script:
- docker info
- docker info
build:
build:
stage: build
stage: build
script:
script:
- docker build -t my-docker-image .
- docker build -t my-docker-image .
- docker run my-docker-image /script/to/run/tests
- docker run my-docker-image /script/to/run/tests
```
```
Docker-in-Docker works well, and is the recommended configuration, but it is
Docker-in-Docker works well, and is the recommended configuration, but it is
...
@@ -246,13 +246,13 @@ In order to do that, follow the steps:
...
@@ -246,13 +246,13 @@ In order to do that, follow the steps:
image: docker:stable
image: docker:stable
before_script:
before_script:
- docker info
- docker info
build:
build:
stage: build
stage: build
script:
script:
- docker build -t my-docker-image .
- docker build -t my-docker-image .
- docker run my-docker-image /script/to/run/tests
- docker run my-docker-image /script/to/run/tests
```
```
While the above method avoids using Docker in privileged mode, you should be
While the above method avoids using Docker in privileged mode, you should be
...
@@ -403,7 +403,7 @@ could look like:
...
@@ -403,7 +403,7 @@ could look like:
build
:
build
:
image
:
docker:stable
image
:
docker:stable
services
:
services
:
-
docker:dind
-
docker:dind
variables
:
variables
:
DOCKER_HOST
:
tcp://docker:2375
DOCKER_HOST
:
tcp://docker:2375
DOCKER_DRIVER
:
overlay2
DOCKER_DRIVER
:
overlay2
...
@@ -456,13 +456,13 @@ an application-specific deploy script:
...
@@ -456,13 +456,13 @@ an application-specific deploy script:
```
yaml
```
yaml
image
:
docker:stable
image
:
docker:stable
services
:
services
:
-
docker:dind
-
docker:dind
stages
:
stages
:
-
build
-
build
-
test
-
test
-
release
-
release
-
deploy
-
deploy
variables
:
variables
:
DOCKER_HOST
:
tcp://docker:2375
DOCKER_HOST
:
tcp://docker:2375
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment