diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-10 18:19:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-10 18:19:14 +0000 |
| commit | 52717ae33c1d3cc01c3529bf48d7f2974529d723 (patch) | |
| tree | 8ac418041c427b2ede14216d7597c620f28aa73e /docker | |
| parent | 575f79d6486ebe5c5be6c28730cb898b71825610 (diff) | |
| parent | 6b793874c61f9a3d5a60e808e8da33446974540b (diff) | |
| download | kolla-52717ae33c1d3cc01c3529bf48d7f2974529d723.tar.gz kolla-52717ae33c1d3cc01c3529bf48d7f2974529d723.zip | |
Merge "Clean dockerfile output on Ubuntu distro"
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 6e564b774..b7b2368cf 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -27,13 +27,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; \ |