Skip to content

Commit

Permalink
Add rclone/install target and add version to the Dockerfile.tools file
Browse files Browse the repository at this point in the history
  • Loading branch information
dwc0011 committed Nov 2, 2021
1 parent c288547 commit 8d009a5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Dockerfile.tools
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ FROM mikefarah/yq:4.14.1 as yq
FROM mstruebing/editorconfig-checker:2.3.5 as ec

FROM quay.io/terraform-docs/terraform-docs:0.16.0 as tfdocs

FROM rclone/rclone:1.53.4 as rclone
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,17 @@ zip/install:
apt-get install zip -y
@ echo "[$@]: Completed successfully!"

rclone/install: RCLONE_VERSION ?= tags/v$(call match_pattern_in_file,$(TARDIGRADE_CI_DOCKERFILE_TOOLS),'rclone/rclone','$(SEMVER_PATTERN)')
rclone/install: | $(BIN_DIR) guard/program/unzip
@ echo "[$@]: Installing $(@D) $(RCLONE_VERSION) ..."
$(call download_github_release,$(@D).zip,$(@D),$(@D),$(RCLONE_VERSION),.name | endswith("$(OS)-$(ARCH).zip"))
unzip $(@D).zip
mv $(@D)-*/$(@D) $(BIN_DIR)
rm -rf $(@D)*
chmod +x $(BIN_DIR)/$(@D)
$(@D) --version
@ echo "[$@]: Completed successfully!"

terraform/install: TERRAFORM_VERSION ?= $(call match_pattern_in_file,$(TARDIGRADE_CI_DOCKERFILE_TOOLS),'hashicorp/terraform','$(SEMVER_PATTERN)')
terraform/install: | $(BIN_DIR) guard/program/jq
@ echo "[$@]: Installing $(@D)..."
Expand Down Expand Up @@ -495,6 +506,6 @@ project/validate:
install: terragrunt/install terraform/install shellcheck/install terraform-docs/install
install: bats/install black/install pylint/install pylint-pytest/install pydocstyle/install pytest/install tftest/install
install: ec/install yamllint/install cfn-lint/install yq/install bumpversion/install jq/install
install: docker-compose/install
install: docker-compose/install rclone/install

lint: project/validate terraform/lint sh/lint json/lint docs/lint python/lint ec/lint cfn/lint hcl/lint

0 comments on commit 8d009a5

Please sign in to comment.