From 55baf154e83ee1936516bbb527ef266946e870bc Mon Sep 17 00:00:00 2001 From: aknysh Date: Wed, 19 Sep 2018 14:09:58 -0400 Subject: [PATCH 1/2] Update `packages` --- Dockerfile | 6 +++--- Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69d85ce58..bc8d3410a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ FROM google/cloud-sdk:216.0.0-alpine as google-cloud-sdk # # Cloud Posse Package Distribution # -FROM cloudposse/packages:0.25.0 as packages +FROM cloudposse/packages:0.26.0 as packages WORKDIR /packages @@ -25,7 +25,7 @@ WORKDIR /packages # # Repo: # -ARG PACKAGES="awless aws-vault cfssl cfssljson chamber fetch figurine github-commenter gomplate goofys helm helmfile kops kubectl kubectx kubens sops stern terraform terragrunt yq shellcheck shfmt" +ARG PACKAGES="awless aws-vault cfssl cfssljson chamber fetch figurine github-commenter gomplate goofys helm helmfile kops kubectl kubectx kubens sops stern terraform terragrunt yq shellcheck shfmt aws-iam-authenticator" ENV PACKAGES=${PACKAGES} RUN make dist @@ -173,7 +173,7 @@ RUN helm plugin install https://github.com/app-registry/appr-helm-plugin --versi && helm plugin install https://github.com/mstrzele/helm-edit --version v${HELM_EDIT_VERSION} \ && helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION} \ && helm plugin install https://github.com/sagansystems/helm-github --version ${HELM_GITHUB_VERSION} \ - && helm plugin install https://github.com/hypnoglow/helm-s3 --version v${HELM_S3_VERSION} \ + && helm plugin install https://github.com/hypnoglow/helm-s3 --version v${HELM_S3_VERSION} \ && helm plugin install https://github.com/chartmuseum/helm-push --version v${HELM_PUSH_VERSION} # # Install bats-core for automated testing diff --git a/Makefile b/Makefile index dd8b20952..44629e37b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ export DOCKER_IMAGE ?= cloudposse/geodesic export DOCKER_TAG ?= dev export DOCKER_IMAGE_NAME ?= $(DOCKER_IMAGE):$(DOCKER_TAG) -export DOCKER_BUILD_FLAGS = +export DOCKER_BUILD_FLAGS = export INSTALL_PATH ?= /usr/local/bin include $(shell curl --silent -o .build-harness "https://raw.githubusercontent.com/cloudposse/build-harness/master/templates/Makefile.build-harness"; echo .build-harness) @@ -21,7 +21,7 @@ build: @make --no-print-directory docker:build install: - @docker run --rm -e CLUSTER=galaxy $(DOCKER_IMAGE_NAME) | sudo -E bash -s dev + @docker run --rm -e CLUSTER=galaxy $(DOCKER_IMAGE_NAME) | sudo -E bash -s $(DOCKER_TAG) run: @geodesic From 2ba6da09cd703657edf416d1c8666159d5cabf03 Mon Sep 17 00:00:00 2001 From: aknysh Date: Wed, 19 Sep 2018 16:49:00 -0400 Subject: [PATCH 2/2] Sort packages --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bc8d3410a..82689bbce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ WORKDIR /packages # # Repo: # -ARG PACKAGES="awless aws-vault cfssl cfssljson chamber fetch figurine github-commenter gomplate goofys helm helmfile kops kubectl kubectx kubens sops stern terraform terragrunt yq shellcheck shfmt aws-iam-authenticator" +ARG PACKAGES="aws-iam-authenticator awless aws-vault cfssl cfssljson chamber fetch figurine github-commenter gomplate goofys helm helmfile kops kubectl kubectx kubens sops stern terraform terragrunt shellcheck shfmt yq" ENV PACKAGES=${PACKAGES} RUN make dist