diff --git a/Makefile b/Makefile index 4a621f30c6..baa56d0f18 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,8 @@ docker/build/apk/all: ## Build alpine packages for testing docker/build/apk/shell: - sudo rm -rf tmp/* + rm -rf tmp/* + [ -n "$(ls tmp/)" ] && sudo rm -rf tmp/* || true docker build -t cloudposse/apkbuild:$(ALPINE_VERSION) -f apk/Dockerfile-$(ALPINE_VERSION) . docker run \ --name apkbuild \ diff --git a/README.md b/README.md index aa70230c56..8a692a79d0 100644 --- a/README.md +++ b/README.md @@ -190,7 +190,7 @@ packages/uninstall/%: ## Makefile Targets ``` assume-role 0.3.2 Easily assume AWS roles in your terminal. -atlantis 0.4.13 Terraform For Teams +atlantis 0.8.3 Terraform For Teams awless 0.1.11 A Mighty CLI for AWS aws-iam-authenticator 0.4.0 A tool to use AWS IAM credentials to authenticate to a Kubernetes cluster aws-okta 0.19.4 aws-okta allows users to authenticate with AWS using Okta credentials @@ -198,6 +198,7 @@ aws-vault 4.6.4 A vault for securely storing and accessing chamber 2.4.0 CLI for managing secrets cli53 0.8.12 Command line tool for Amazon Route 53 cloudflared 2019.9.0 Argo Tunnel client +cloudposse-atlantis 0.8.0 Terraform For Teams, enhanced by Cloud Posse codefresh 0.32.1 Codefresh CLI ctop 0.7.1 Top-like interface for container metrics direnv 2.20.0 Unclutter your .profile diff --git a/docs/targets.md b/docs/targets.md index 3ad0cc0100..7623d03d9c 100644 --- a/docs/targets.md +++ b/docs/targets.md @@ -1,7 +1,7 @@ ## Makefile Targets ``` assume-role 0.3.2 Easily assume AWS roles in your terminal. -atlantis 0.4.13 Terraform For Teams +atlantis 0.8.3 Terraform For Teams awless 0.1.11 A Mighty CLI for AWS aws-iam-authenticator 0.4.0 A tool to use AWS IAM credentials to authenticate to a Kubernetes cluster aws-okta 0.19.4 aws-okta allows users to authenticate with AWS using Okta credentials @@ -9,6 +9,7 @@ aws-vault 4.6.4 A vault for securely storing and accessing chamber 2.4.0 CLI for managing secrets cli53 0.8.12 Command line tool for Amazon Route 53 cloudflared 2019.9.0 Argo Tunnel client +cloudposse-atlantis 0.8.0 Terraform For Teams, enhanced by Cloud Posse codefresh 0.32.1 Codefresh CLI ctop 0.7.1 Top-like interface for container metrics direnv 2.20.0 Unclutter your .profile diff --git a/vendor/atlantis/Makefile b/vendor/atlantis/Makefile index 4931ea695b..a233d53b1f 100644 --- a/vendor/atlantis/Makefile +++ b/vendor/atlantis/Makefile @@ -5,6 +5,10 @@ include ../../tasks/Makefile.apk export VENDOR ?= runatlantis export DOWNLOAD_URL ?= $(PACKAGE_REPO_URL)/releases/download/v$(PACKAGE_VERSION)/$(PACKAGE_NAME)_$(OS)_$(ARCH).zip export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary +export APKBUILD_DEPENDS += dpkg +export APKBUILD_INSTALL_SCRIPTS = $(PACKAGE_NAME).post-install $(PACKAGE_NAME).post-deinstall +export MASTER_PACKAGE_NAME = atlantis +export INSTALL_DIR = /usr/share/${MASTER_PACKAGE_NAME}/${VENDOR}/bin install: $(call download_zip) diff --git a/vendor/atlantis/VERSION b/vendor/atlantis/VERSION index 1f77169993..ee94dd834b 100644 --- a/vendor/atlantis/VERSION +++ b/vendor/atlantis/VERSION @@ -1 +1 @@ -0.4.13 +0.8.3 diff --git a/vendor/atlantis/atlantis.post-deinstall b/vendor/atlantis/atlantis.post-deinstall new file mode 100755 index 0000000000..75273f3cad --- /dev/null +++ b/vendor/atlantis/atlantis.post-deinstall @@ -0,0 +1,9 @@ +#!/bin/sh +# This is an Alpine `deinstall` hook that removes the alternative +MASTER_PACKAGE_NAME=atlantis +PACKAGE_NAME=atlantis +VENDOR=runatlantis +INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${VENDOR}/bin + +update-alternatives --remove ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} --quiet +exit 0 diff --git a/vendor/atlantis/atlantis.post-install b/vendor/atlantis/atlantis.post-install new file mode 100755 index 0000000000..a7d1bd5991 --- /dev/null +++ b/vendor/atlantis/atlantis.post-install @@ -0,0 +1,10 @@ +#!/bin/sh +# This is an Alpine Package `post-install` hook that links +# an alternative from `/usr/share/${PACKAGE_NAME}/$version/bin` into `/usr/bin/` +MASTER_PACKAGE_NAME=atlantis +PACKAGE_NAME=atlantis +VENDOR=runatlantis +INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${VENDOR}/bin +mkdir -p ${INSTALL_DIR} +update-alternatives --install /usr/bin/${MASTER_PACKAGE_NAME} ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} 1 +exit 0 diff --git a/vendor/cloudposse-atlantis/DESCRIPTION b/vendor/cloudposse-atlantis/DESCRIPTION new file mode 100644 index 0000000000..64260f80e0 --- /dev/null +++ b/vendor/cloudposse-atlantis/DESCRIPTION @@ -0,0 +1 @@ +Terraform For Teams, enhanced by Cloud Posse diff --git a/vendor/cloudposse-atlantis/LICENSE b/vendor/cloudposse-atlantis/LICENSE new file mode 100644 index 0000000000..7a85ddd4e2 --- /dev/null +++ b/vendor/cloudposse-atlantis/LICENSE @@ -0,0 +1 @@ +APACHE-2.0 diff --git a/vendor/cloudposse-atlantis/Makefile b/vendor/cloudposse-atlantis/Makefile new file mode 100644 index 0000000000..ee2a836abf --- /dev/null +++ b/vendor/cloudposse-atlantis/Makefile @@ -0,0 +1,19 @@ +export MASTER_PACKAGE_NAME = atlantis +export PACKAGE_REPO_NAME = atlantis + +include ../../tasks/Makefile.package +include ../../tasks/Makefile.apk + +# Package details +export VENDOR ?= cloudposse +export DOWNLOAD_URL ?= $(PACKAGE_REPO_URL)/releases/download/$(PACKAGE_VERSION)/$(PACKAGE_REPO_NAME)_$(OS)_$(ARCH) +export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary +export APKBUILD_DEPENDS += dpkg libc6-compat +export APKBUILD_INSTALL_SCRIPTS = $(PACKAGE_NAME).post-install $(PACKAGE_NAME).post-deinstall +export INSTALL_DIR = /usr/share/${MASTER_PACKAGE_NAME}/${VENDOR}/bin + +install: + $(call download_binary) + +test: + $(PACKAGE_EXE) version diff --git a/vendor/cloudposse-atlantis/RELEASE b/vendor/cloudposse-atlantis/RELEASE new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/vendor/cloudposse-atlantis/RELEASE @@ -0,0 +1 @@ +0 diff --git a/vendor/cloudposse-atlantis/VERSION b/vendor/cloudposse-atlantis/VERSION new file mode 100644 index 0000000000..a3df0a6959 --- /dev/null +++ b/vendor/cloudposse-atlantis/VERSION @@ -0,0 +1 @@ +0.8.0 diff --git a/vendor/cloudposse-atlantis/cloudposse-atlantis.post-deinstall b/vendor/cloudposse-atlantis/cloudposse-atlantis.post-deinstall new file mode 100755 index 0000000000..c62bcba84d --- /dev/null +++ b/vendor/cloudposse-atlantis/cloudposse-atlantis.post-deinstall @@ -0,0 +1,9 @@ +#!/bin/sh +# This is an Alpine `deinstall` hook that removes the alternative +MASTER_PACKAGE_NAME=atlantis +PACKAGE_NAME=cloudposse-atlantis +VENDOR=cloudposse +INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${VENDOR}/bin + +update-alternatives --remove ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} --quiet +exit 0 diff --git a/vendor/cloudposse-atlantis/cloudposse-atlantis.post-install b/vendor/cloudposse-atlantis/cloudposse-atlantis.post-install new file mode 100755 index 0000000000..bb0fa969bb --- /dev/null +++ b/vendor/cloudposse-atlantis/cloudposse-atlantis.post-install @@ -0,0 +1,10 @@ +#!/bin/sh +# This is an Alpine Package `post-install` hook that links +# an alternative from `/usr/share/${PACKAGE_NAME}/$version/bin` into `/usr/bin/` +MASTER_PACKAGE_NAME=atlantis +PACKAGE_NAME=cloudposse-atlantis +VENDOR=cloudposse +INSTALL_DIR=/usr/share/${MASTER_PACKAGE_NAME}/${VENDOR}/bin +mkdir -p ${INSTALL_DIR} +update-alternatives --install /usr/bin/${MASTER_PACKAGE_NAME} ${MASTER_PACKAGE_NAME} ${INSTALL_DIR}/${PACKAGE_NAME} 2 +exit 0