summaryrefslogtreecommitdiff
path: root/docker/helm-repository
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-12-05 10:48:08 +0100
committerMartin André <m.andre@redhat.com>2017-12-05 10:53:49 +0100
commit3364720f3435a7e5469e0f1ed0bce4c02e70af9d (patch)
tree82a04878ac2f36013baefee094ea249810252750 /docker/helm-repository
parente38683d2123b446c34d869912404b662bd56efa9 (diff)
downloadkolla-3364720f3435a7e5469e0f1ed0bce4c02e70af9d.tar.gz
kolla-3364720f3435a7e5469e0f1ed0bce4c02e70af9d.zip
Validate Dockerfile indentation in pep8
Delegate code style validation to computers, they're better than human at it :) This commit adds a new `tools/validate-indentation.sh` script that errors when it finds an indented Dockerfile instruction, and enables the validation in the pep8 check. Also adjust the logic of `tools/validate-all-dockerfiles.sh` so that it doesn't stop on first errors but instead shows all of them. Fixes the remaining indentations in Dockerfiles. Change-Id: I53c0d38304cb4f6d64a5dfab67f70d69b3eae587
Diffstat (limited to 'docker/helm-repository')
-rw-r--r--docker/helm-repository/Dockerfile.j28
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2
index c3028f61d..dfb2ebdc2 100644
--- a/docker/helm-repository/Dockerfile.j2
+++ b/docker/helm-repository/Dockerfile.j2
@@ -46,12 +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) }}
-ENV helm_arch={{ base_arch }}
-
{% if base_arch == 'x86_64' %}
- ENV helm_arch=amd64
+ENV helm_arch=amd64
{% elif base_arch == 'aarch64' %}
- ENV helm_arch=arm64
+ENV helm_arch=arm64
+{% else %}
+ENV helm_arch={{ base_arch }}
{% endif %}
{% block helm_repository_install_kubernetes_helm %}