openstack
/
kolla
Code Issues Proposed changes

Merge "Add helm_repository_install_kubernetes_helm block for helm Dockerfile.j2"

This commit is contained in:
Jenkins 2017-02-21 18:40:21 +00:00 committed by Gerrit Code Review
parent 0bbd04a48a 16366bb571
commit 7450c32cd2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/helm-repository/Dockerfile.j2
View File

@ -46,10 +46,12 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
RUN {{ macros.install_pip(helm_repository_pip_packages | customizable("pip_packages"), constraints = false) }}
{% block helm_repository_install_kubernetes_helm %}
RUN curl -Lo /tmp/helm-v${helm_version}-linux-amd64.tar.gz http://storage.googleapis.com/kubernetes-helm/helm-v${helm_version}-linux-amd64.tar.gz \
&& sudo tar --strip-components 1 -C /usr/bin linux-amd64/helm -zxvf /tmp/helm-v${helm_version}-linux-amd64.tar.gz \
&& sudo chmod 755 /usr/bin/helm \
&& rm /tmp/helm-v${helm_version}-linux-amd64.tar.gz
{% endblock %}
RUN useradd --user-group --create-home --home-dir /home/helm helm \
&& sudo mkdir /helm-repo \