aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j22
-rw-r--r--docker/base/kolla_bashrc1
2 files changed, 0 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index ba5759bf6..cd4c16071 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 }}
@@ -219,7 +218,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)\]"