From 3364720f3435a7e5469e0f1ed0bce4c02e70af9d Mon Sep 17 00:00:00 2001 From: Martin André Date: Tue, 5 Dec 2017 10:48:08 +0100 Subject: 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 --- docker/helm-repository/Dockerfile.j2 | 8 ++++---- docker/ironic/ironic-pxe/Dockerfile.j2 | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'docker') 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 %} diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index c319973e0..ada4b0e83 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% if base_arch == 'aarch64' %} - ENV ironic_arch=aarch64 +ENV ironic_arch=aarch64 {% set ironic_pxe_packages = ironic_pxe_packages + [ 'grub2-efi', 'grub2-efi-aa64-modules' @@ -41,7 +41,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 'syslinux' ] %} {% elif base_arch == 'aarch64' %} - ENV ironic_arch=aarch64 +ENV ironic_arch=aarch64 {% set ironic_pxe_packages = ironic_pxe_packages + [ 'grub-efi-arm64' ] %} -- cgit v1.2.3