diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7113ef17..37fe933b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -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 diff --git a/.gitignore b/.gitignore index 840f750a..ccb98e77 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ # python caching when pytest is used __pycache__ + +#ide folders +.idea/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 76891512..b97659a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile.tools b/Dockerfile.tools index 5ffbf18c..521f54ff 100644 --- a/Dockerfile.tools +++ b/Dockerfile.tools @@ -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 @@ -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 diff --git a/Makefile b/Makefile index fcaad268..d9051b9a 100644 --- a/Makefile +++ b/Makefile @@ -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)..." @@ -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