Add an ansible terraform custom image

* Adds install-terraform for installing terraform binaries
* Adds install-ansible for installing ansible binaries
* Adds a ruby-2.3-ansible-2.5.1-terraform-0.11 image

Towards https://gitlab.com/gitlab-org/omnibus-gitlab/issues/3395
This commit is contained in:
Richard Clamp 2018-04-19 14:45:40 +01:00
parent f73dcbccba
commit 61ec1a94bc
6 changed files with 61 additions and 5 deletions

View file

@ -20,7 +20,7 @@ Assuming the image you want to add is called `new-image`....
1. Add a test task: `new-image test: *test_build`
1. Add a new build task: `new-image: *build_and_deploy`
1. Add a Dockerfile: `Dockerfile.new-image`
1. Add a Dockerfile: `Dockerfile.new-image`
## Use a custom image with versioned features
@ -29,7 +29,7 @@ To add a new image to the build, edit [`.gitlab-ci.yml`](https://gitlab.com/gitl
With custom images, the name of the image is used to define the contents (as opposed to use a bespoke Dockerfile build).
For this reason, the name needs to be correctly defined.
For this reason, the name needs to be correctly defined.
The name is defined as `[feature]-[version]` pairs, separated by `-`.
@ -42,7 +42,7 @@ Here are some example build names:
The first pair represents the base image and version. So `ruby-2.1-...` will use the `ruby:2.1` base image, while
`golang-1.8` will use the `golang:1.8` base image.
Each of the following parts represents another feature and version. Available
Each of the following parts represents another feature and version. Available
options are:
1. `golang`
@ -52,11 +52,13 @@ options are:
5. `yarn`
6. `phantomjs`
7. `postgres`
8. `terraform`
9. `ansible`
### Adding a new build
As an example, if you want to add new image for Ruby 2.4 with `git` 2.14 and `golang` 1.9,
the name would be `ruby-2.4-golang-1.9-git-2.14`.
As an example, if you want to add new image for Ruby 2.4 with `git` 2.14 and `golang` 1.9,
the name would be `ruby-2.4-golang-1.9-git-2.14`.
1. Add a test task: `ruby-2.4-golang-1.9-git-2.14 test: *test_custom`
1. Add a new build task: `ruby-2.4-golang-1.9-git-2.14: *build_and_deploy_custom`