NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-10 10:32:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feat-terraform-image' into 'master'

Browse source 
Add terraform image

See merge request gitlab-org/gitlab-build-images!280
This commit is contained in:
Stan Hu 2020-03-26 04:26:13 +00:00
commit 3b3dd01034
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -118,6 +118,7 @@ sitespeed-gitlab test: *test_build
ubi-release test: *test_build ubi-release test: *test_build
www-gitlab-com-2.6 test: *test_build www-gitlab-com-2.6 test: *test_build
build-git: *test_build build-git: *test_build
terraform test: *test_build
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml # Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
gitlab-docs test: *test_build gitlab-docs test: *test_build
gitlab-docs-lint test: *test_build gitlab-docs-lint test: *test_build
@ -181,6 +182,7 @@ sitespeed-gitlab: *build_and_deploy
ubi-release: *build_and_deploy ubi-release: *build_and_deploy
www-gitlab-com-2.6: *build_and_deploy www-gitlab-com-2.6: *build_and_deploy
build-git: *build_and_deploy build-git: *build_and_deploy
terraform: *build_and_deploy
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml # Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
gitlab-docs: *build_and_deploy gitlab-docs: *build_and_deploy
gitlab-docs-lint: *build_and_deploy gitlab-docs-lint: *build_and_deploy

3
Dockerfile.terraform Normal file
View file

@ -0,0 +1,3 @@
FROM hashicorp/terraform:light
RUN apk --update --no-cache add jq