Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
Terraform Images
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
rc
Terraform Images
Commits
76a57cc0
"git@gitlab.rc.uab.edu:firiaye/mistral.git" did not exist on "c589c444311e687ee96b089373934ee1d215479a"
Commit
76a57cc0
authored
5 years ago
by
Matt Kasa
Browse files
Options
Downloads
Patches
Plain Diff
Combine Dockerfiles into single file
parent
0c90d42b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-1
3 additions, 1 deletion
.gitlab-ci.yml
Dockerfile
+3
-1
3 additions, 1 deletion
Dockerfile
Dockerfile.0.12
+0
-5
0 additions, 5 deletions
Dockerfile.0.12
with
6 additions
and
7 deletions
.gitlab-ci.yml
+
3
−
1
View file @
76a57cc0
...
@@ -19,7 +19,7 @@ stages:
...
@@ -19,7 +19,7 @@ stages:
<<
:
*dind
<<
:
*dind
stage
:
build
stage
:
build
script
:
script
:
-
docker build --tag "$BUILD_IMAGE_NAME" --
file "Dockerfile.
$TERRAFORM_
VERSION"
.
-
docker build --tag "$BUILD_IMAGE_NAME" --
build-arg BASE=
$TERRAFORM_
BASE
.
-
docker push "$BUILD_IMAGE_NAME"
-
docker push "$BUILD_IMAGE_NAME"
.test-unit
:
&test-unit
.test-unit
:
&test-unit
...
@@ -41,10 +41,12 @@ stages:
...
@@ -41,10 +41,12 @@ stages:
.terraform-0.11
:
&terraform011
.terraform-0.11
:
&terraform011
variables
:
variables
:
TERRAFORM_BASE
:
"
hashicorp/terraform:0.11.13"
TERRAFORM_VERSION
:
"
0.11"
TERRAFORM_VERSION
:
"
0.11"
.terraform-0.12
:
&terraform012
.terraform-0.12
:
&terraform012
variables
:
variables
:
TERRAFORM_BASE
:
"
hashicorp/terraform:0.12.26"
TERRAFORM_VERSION
:
"
0.12"
TERRAFORM_VERSION
:
"
0.12"
build 0.11
:
build 0.11
:
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
.0.11
→
Dockerfile
+
3
−
1
View file @
76a57cc0
FROM hashicorp/terraform:0.11.13
ARG
BASE=hashicorp/terraform:latest
FROM
$BASE
RUN
apk add
--no-cache
jq
RUN
apk add
--no-cache
jq
# Override ENTRYPOINT since hashicorp/terraform uses `terraform`
# Override ENTRYPOINT since hashicorp/terraform uses `terraform`
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.0.12
deleted
100644 → 0
+
0
−
5
View file @
0c90d42b
FROM hashicorp/terraform:0.12.26
RUN apk add --no-cache jq
# Override ENTRYPOINT since hashicorp/terraform uses `terraform`
ENTRYPOINT []
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment