diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-21 15:37:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-21 15:37:41 +0000 |
| commit | 6a9681ba9b6a9581a0ac18a56a176aab13f9f55a (patch) | |
| tree | f95ad13413fab9bc07b2f6cbb6357b3a73175469 /docker | |
| parent | 9f78dc4e847718e776319da7c367ab2eeb0f14ce (diff) | |
| parent | 360c868758a552bcb08752d2c8f14cfa759f151b (diff) | |
| download | kolla-6a9681ba9b6a9581a0ac18a56a176aab13f9f55a.tar.gz kolla-6a9681ba9b6a9581a0ac18a56a176aab13f9f55a.zip | |
Merge "helm-repository: make it work on non-x86"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/helm-repository/Dockerfile.j2 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2 index 6e219fb23..c3304b7de 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -46,11 +46,19 @@ 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) }} +ENV helm_arch={{ base_arch }} + +{% if base_arch == 'x86_64' %} + ENV helm_arch=amd64 +{% elif base_arch == 'aarch64' %} + ENV helm_arch=arm64 +{% endif %} + {% 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 \ +RUN curl -Lo /tmp/helm-v${helm_version}-linux-${helm_arch}.tar.gz http://storage.googleapis.com/kubernetes-helm/helm-v${helm_version}-linux-${helm_arch}.tar.gz \ + && sudo tar --strip-components 1 -C /usr/bin linux-${helm_arch}/helm -zxvf /tmp/helm-v${helm_version}-linux-${helm_arch}.tar.gz \ && sudo chmod 755 /usr/bin/helm \ - && rm /tmp/helm-v${helm_version}-linux-amd64.tar.gz + && rm /tmp/helm-v${helm_version}-linux-${helm_arch}.tar.gz {% endblock %} RUN useradd --user-group --create-home --home-dir /home/helm helm \ |