From 6b793874c61f9a3d5a60e808e8da33446974540b Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Tue, 24 Jan 2017 21:51:27 +0100 Subject: Clean dockerfile output on Ubuntu distro Ubuntu Dockerfile output actually contains not related RPM comments. Change-Id: I306baeaa2d4ffa1269a347e1e1b23f26caefda06 --- docker/base/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 97cb90b3f..aca130de4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -28,13 +28,12 @@ RUN cat /tmp/kolla_bashrc >> /etc/skel/.bashrc \ # PS1 var when used /bin/sh shell ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(hostname -s) $(pwd)]$ " +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} # For RPM Variants, enable the correct repositories - this should all be done # in the base image so repos are consistent throughout the system. This also # enables to provide repo overrides at a later date in a simple fashion if we # desire such functionality. I think we will :) -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release); \ if [ $CURRENT_DISTRO_RELEASE != "{{ supported_distro_release }}" ]; then \ echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \ -- cgit v1.2.3