diff options
| author | Martin André <m.andre@redhat.com> | 2017-12-05 10:48:08 +0100 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-12-05 10:53:49 +0100 |
| commit | 3364720f3435a7e5469e0f1ed0bce4c02e70af9d (patch) | |
| tree | 82a04878ac2f36013baefee094ea249810252750 /docker/ironic | |
| parent | e38683d2123b446c34d869912404b662bd56efa9 (diff) | |
| download | kolla-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/ironic')
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
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' ] %} |