Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Commit

Permalink
fix(makefile): added needed export vars
Browse files Browse the repository at this point in the history
Signed-off-by: haarchri <chhaar30@googlemail.com>
  • Loading branch information
haarchri committed Feb 6, 2022
1 parent 135ce91 commit d8b8734
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
PROJECT_NAME := provider-jet-aws
PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME)

export TERRAFORM_VERSION := 1.0.5
export TERRAFORM_PROVIDER_SOURCE := hashicorp/aws
export TERRAFORM_PROVIDER_VERSION := 3.56.0
export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-aws
export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX := https://github.com/hashicorp/terraform-provider-aws/releases/download/v3.56.0

PLATFORMS ?= linux_amd64 linux_arm64

# -include will silently skip missing files, which allows us
Expand Down
9 changes: 5 additions & 4 deletions cluster/images/provider-jet-aws-controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ ENV USER_ID=1001
# Setup Terraform environment

## Provider-dependent configuration
ENV TERRAFORM_VERSION 1.0.5
ENV TERRAFORM_PROVIDER_SOURCE "hashicorp/aws"
ENV TERRAFORM_PROVIDER_VERSION 3.56.0
ENV TERRAFORM_PROVIDER_DOWNLOAD_NAME terraform-provider-aws
ARG TERRAFORM_VERSION
ARG TERRAFORM_PROVIDER_SOURCE
ARG TERRAFORM_PROVIDER_VERSION
ARG TERRAFORM_PROVIDER_DOWNLOAD_NAME
ARG TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX
## End of - Provider-dependent configuration

ENV PLUGIN_DIR /terraform/provider-mirror/registry.terraform.io/${TERRAFORM_PROVIDER_SOURCE}/${TERRAFORM_PROVIDER_VERSION}/linux_${ARCH}
Expand Down
5 changes: 5 additions & 0 deletions cluster/images/provider-jet-aws-controller/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ img.build:
@docker build $(BUILD_ARGS) \
--build-arg ARCH=$(ARCH) \
--build-arg TINI_VERSION=$(TINI_VERSION) \
--build-arg TERRAFORM_VERSION=$(TERRAFORM_VERSION) \
--build-arg TERRAFORM_PROVIDER_SOURCE=$(TERRAFORM_PROVIDER_SOURCE) \
--build-arg TERRAFORM_PROVIDER_VERSION=$(TERRAFORM_PROVIDER_VERSION) \
--build-arg TERRAFORM_PROVIDER_DOWNLOAD_NAME=$(TERRAFORM_PROVIDER_DOWNLOAD_NAME) \
--build-arg TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX=$(TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX) \
-t $(IMAGE) \
$(IMAGE_TEMP_DIR) || $(FAIL)
@$(OK) docker build $(IMAGE)

0 comments on commit d8b8734

Please sign in to comment.