From b3a695e9347b0164c0b055bbcf5b717a3a2f3bd0 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 2 Dec 2015 17:53:52 +0800 Subject: Remove the meaningless comment line in base image Dockerfile Use jinja2 comment syntax instead. Closes-Bug: #1521932 Change-Id: Ida5a9204e7affe880ac6156d3fed3206b1eae7b9 --- docker/base/Dockerfile.j2 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1c2d31433..2439a22c1 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -53,7 +53,7 @@ RUN curl http://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.r RUN curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo {% endif %} - # endif for repo setup for all RHEL except RHEL OSP + {# endif for repo setup for all RHEL except RHEL OSP #} {% if install_metatype == 'rhos' %} @@ -73,7 +73,7 @@ RUN rpm -e --nodeps systemd-container systemd-container-libs \ && yum clean all {% endif %} - # Endif for base_distro centos + {# Endif for base_distro centos #} {% if base_distro == 'rhel' %} @@ -87,7 +87,7 @@ RUN yum install -y \ && yum-config-manager --enable rhel-7-server-extras-rpms {% endif %} - # Endif for base_distro RHEL + {# Endif for base_distro RHEL #} {% if base_distro == 'oraclelinux' %} @@ -99,7 +99,7 @@ RUN yum-config-manager --enable ol7_optional_latest ol7_addons RUN yum install -y yum-plugin-priorities {% endif %} - # Endif for base_distro oraclelinux + {# Endif for base_distro oraclelinux #} {% if base_distro == 'fedora' %} @@ -110,12 +110,12 @@ RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \ && yum clean all {% endif %} - # Endif for base_distro fedora + {# Endif for base_distro fedora #} #### END REPO ENABLEMENT -# We are back to the basic if conditional here which is: -# if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] +{# We are back to the basic if conditional here which is: + if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #} RUN yum update -y \ && yum clean all @@ -135,7 +135,7 @@ RUN yum install -y \ && yum clean all {% endif %} - # Endif for install_type binary + {# Endif for install_type binary #} {% if install_type == 'source' %} @@ -147,9 +147,9 @@ RUN yum -y install \ which \ && yum clean all - # endif for install type is source for RPM based distros {% endif %} -# endif for base_distro centos,fedora,oraclelinux,rhel + {# endif for install type is source for RPM based distros #} +{# endif for base_distro centos,fedora,oraclelinux,rhel #} {% elif base_distro in ['ubuntu', 'debian'] %} # This will prevent questions from being asked during the install -- cgit v1.2.3