diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-03 02:53:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-03 02:53:00 +0000 |
| commit | 6fa8261a5c005245639de1734ae073418619ca0d (patch) | |
| tree | a20c352ebc2af43be27241b35ae425a1a3775e91 /docker | |
| parent | 86a99c463422d3dcbf6849153a4cadd892ed3247 (diff) | |
| parent | 2c342143883894525ef670bf196edb8566eab71c (diff) | |
| download | kolla-6fa8261a5c005245639de1734ae073418619ca0d.tar.gz kolla-6fa8261a5c005245639de1734ae073418619ca0d.zip | |
Merge "Remove unecessary blank lines"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/kolla_bashrc | 1 | ||||
| -rw-r--r-- | docker/elasticsearch/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/extend_start.sh | 1 | ||||
| -rw-r--r-- | docker/mistral/mistral-api/Dockerfile.j2 | 1 |
5 files changed, 0 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 22181ff9c..5cf3633c0 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -3,7 +3,6 @@ MAINTAINER {{ maintainer }} LABEL kolla_version="{{ kolla_version }}" - {{ include_header }} ENV KOLLA_BASE_DISTRO {{ base_distro }} @@ -210,7 +209,6 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 199369E540 && rm -rf /usr/lib/python2.7/site-packages \ && ln -s dist-packages /usr/lib/python2.7/site-packages - {% endif %} COPY set_configs.py /usr/local/bin/kolla_set_configs diff --git a/docker/base/kolla_bashrc b/docker/base/kolla_bashrc index c797e51a9..09b19cc06 100644 --- a/docker/base/kolla_bashrc +++ b/docker/base/kolla_bashrc @@ -1,4 +1,3 @@ - #### Custom data added by Kolla _KBOLD="\[$(tput bold)\]" _KRESET="\[$(tput sgr0)\]" diff --git a/docker/elasticsearch/Dockerfile.j2 b/docker/elasticsearch/Dockerfile.j2 index c433db54b..afa302775 100644 --- a/docker/elasticsearch/Dockerfile.j2 +++ b/docker/elasticsearch/Dockerfile.j2 @@ -1,7 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/ diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index ce43ec378..02ee5480a 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -11,4 +11,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then done exit 0 fi - diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2 index b74227570..0e06ec0b9 100644 --- a/docker/mistral/mistral-api/Dockerfile.j2 +++ b/docker/mistral/mistral-api/Dockerfile.j2 @@ -11,7 +11,6 @@ RUN yum -y install \ {% endif %} {% endif %} - COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start RUN chmod 755 /usr/local/bin/kolla_mistral_extend_start |