diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-21 18:40:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-21 18:40:21 +0000 |
| commit | 7450c32cd2708281a369935073cdd09074351f54 (patch) | |
| tree | 0b8ac4024b10317166a0f9c0ad0618313a249d50 /docker | |
| parent | 0bbd04a48ab7895367fe0d1b55d4f4709e7e6720 (diff) | |
| parent | 16366bb571f7ce22ba872019491266e354f6f693 (diff) | |
| download | kolla-7450c32cd2708281a369935073cdd09074351f54.tar.gz kolla-7450c32cd2708281a369935073cdd09074351f54.zip | |
Merge "Add helm_repository_install_kubernetes_helm block for helm Dockerfile.j2"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/helm-repository/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2 index c487e5a64..f99e41c10 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -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 \ |