diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-19 11:51:24 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-19 11:52:38 +0200 |
| commit | 360c868758a552bcb08752d2c8f14cfa759f151b (patch) | |
| tree | 598b4204fd37de4a99483e0145e0505455c7d6d0 /docker | |
| parent | e5551cc7349a8e17fe0651f6711e6fe001a9c745 (diff) | |
| download | kolla-360c868758a552bcb08752d2c8f14cfa759f151b.tar.gz kolla-360c868758a552bcb08752d2c8f14cfa759f151b.zip | |
helm-repository: make it work on non-x86
With 2.3.0 we can use upstream binaries on other architectures than
x86-64.
Partially-Implements: blueprint multiarch-and-arm64-containers
Change-Id: I5e13fea4a152079d0fbe72d8c39e0fe068562fc2
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 9a7e920a0..5c2f7e4a0 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 \ |