Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packages #283

Merged
merged 2 commits into from
Sep 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -25,7 +25,7 @@ WORKDIR /packages
#
# Repo: <https://github.com/cloudposse/packages>
#
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="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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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