diff --git a/spec/helm_s3_spec.sh b/spec/helm_s3_spec.sh new file mode 100644 index 00000000..51db2dff --- /dev/null +++ b/spec/helm_s3_spec.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env shellspec + +Describe "printVersion()" + printVersion() { + helm plugin list | grep "s3" | grep "${HELM_S3_VERSION}" + } + + It "validates tool is installed by checking version" + When call printVersion + The output should include "${HELM_S3_VERSION}" + The status should eq 0 + End +End diff --git a/spec/serverless_spec.sh b/spec/serverless_spec.sh index b1afbde0..21d76002 100644 --- a/spec/serverless_spec.sh +++ b/spec/serverless_spec.sh @@ -2,7 +2,7 @@ Describe "printVersion()" printVersion() { - serverless --version | grep "${SERVERLESS_VERSION}" + serverless --version | grep --color=never "${SERVERLESS_VERSION}" } It "validates tool is installed by checking version" diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile index adadf305..7f813bc0 100644 --- a/src/docker/Dockerfile +++ b/src/docker/Dockerfile @@ -257,6 +257,13 @@ RUN helm plugin install https://github.com/aslafy-z/helm-git.git --version "${HE && asdf reshim helm \ && rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* +# Install helm-s3 plugin. Get versions from https://github.com/hypnoglow/helm-s3/releases +ARG HELM_S3_VERSION="0.10.0" +ENV HELM_S3_VERSION=${HELM_S3_VERSION} +RUN helm plugin install https://github.com/hypnoglow/helm-s3.git --version "${HELM_S3_VERSION}" \ + && asdf reshim helm \ + && rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???* + # Install helmfile. Get versions using 'asdf list all helmfile'. ARG HELMFILE_VERSION="0.138.2" ENV HELMFILE_VERSION=${HELMFILE_VERSION}