Skip to content

Commit

Permalink
Merge pull request #333 from dwc0011/add-new-tool-targets
Browse files Browse the repository at this point in the history
Add new tool targets
  • Loading branch information
dwc0011 authored Nov 3, 2021
2 parents 63e3c17 + 54e0f96 commit 8c78f0a
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.19.1
current_version = 0.19.2
commit = True
message = Bumps version to {new_version}
tag = False
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@

# python caching when pytest is used
__pycache__

#ide folders
.idea/
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).

### 0.19.2

**Released**: 2021.11.03

**Commit Delta**: [Change from 0.19.1 release](https://github.com/plus3it/tardigrade-ci/compare/0.19.1..0.19.2)

**Summary**:

* Adds new Makefile targets for the purpose of installing packer and rclone

* Adds install targets for the tools:
* packer 1.7.8
* rclone 1.57.0

### 0.19.1

**Released**: 2021.11.01
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.tools
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

FROM bats/bats:1.5.0 as bats

FROM hashicorp/packer:1.7.8 as packer

FROM hashicorp/terraform:1.0.10 as terraform

FROM koalaman/shellcheck:v0.7.2 as shellcheck
Expand All @@ -14,3 +16,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.57.0 as rclone
22 changes: 21 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,26 @@ zip/install:
apt-get install zip -y
@ echo "[$@]: Completed successfully!"

packer/install: PACKER_VERSION ?= $(call match_pattern_in_file,$(TARDIGRADE_CI_DOCKERFILE_TOOLS),'hashicorp/packer','$(SEMVER_PATTERN)')
packer/install: | $(BIN_DIR) guard/program/jq
@ echo "[$@]: Installing $(@D) $(PACKER_VERSION)..."
$(call download_hashicorp_release,$(@D).zip,$(@D),$(PACKER_VERSION))
unzip $(@D).zip && rm -f $(@D).zip && chmod +x $(@D)
mv $(@D) "$(BIN_DIR)"
$(@D) --version
@ 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 +515,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 packer/install

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

0 comments on commit 8c78f0a

Please sign in to comment.