diff options
| author | James McCarthy <james.m.mccarthy@oracle.com> | 2017-02-20 11:30:54 +0000 |
|---|---|---|
| committer | James McCarthy <james.m.mccarthy@oracle.com> | 2017-02-20 16:21:54 +0000 |
| commit | 16366bb571f7ce22ba872019491266e354f6f693 (patch) | |
| tree | 87c2fdb0611dbf83c37b8e4e698daf564ce8a820 | |
| parent | ae4318ff0c2ed302708f3b998a63c3fc0356849f (diff) | |
| download | kolla-16366bb571f7ce22ba872019491266e354f6f693.tar.gz kolla-16366bb571f7ce22ba872019491266e354f6f693.zip | |
Add helm_repository_install_kubernetes_helm block for helm Dockerfile.j2
Allow overriding of kubernetes-helm to facilitate an alternate location.
Change-Id: I630d1e1368ddbbbc795048a73ecc182952da751d
| -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 55505e89b..2b1dc3e8d 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -42,10 +42,12 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN pip install pyyaml +{% 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 \ |