diff options
| author | Bertrand Lallau <bertrand.lallau@gmail.com> | 2017-01-24 21:51:27 +0100 |
|---|---|---|
| committer | Bertrand Lallau <bertrand.lallau@gmail.com> | 2017-01-24 21:51:27 +0100 |
| commit | 6b793874c61f9a3d5a60e808e8da33446974540b (patch) | |
| tree | 6e9b3280df8322b05af90cb193c27c2b05fd3d4d /docker | |
| parent | a29a5ad919d79ecbb6b180723ce5afe675c5780e (diff) | |
| download | kolla-6b793874c61f9a3d5a60e808e8da33446974540b.tar.gz kolla-6b793874c61f9a3d5a60e808e8da33446974540b.zip | |
Clean dockerfile output on Ubuntu distro
Ubuntu Dockerfile output actually contains not related RPM comments.
Change-Id: I306baeaa2d4ffa1269a347e1e1b23f26caefda06
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
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; \ |