Skip to content
Snippets Groups Projects
Commit 76a57cc0 authored by Matt Kasa's avatar Matt Kasa
Browse files

Combine Dockerfiles into single file

parent 0c90d42b
No related branches found
No related tags found
No related merge requests found
...@@ -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:
......
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`
......
FROM hashicorp/terraform:0.12.26
RUN apk add --no-cache jq
# Override ENTRYPOINT since hashicorp/terraform uses `terraform`
ENTRYPOINT []
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment