diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 13:39:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 13:39:07 +0000 |
| commit | d69ab19701a142fb654cdecb3d4fda09e098d7a8 (patch) | |
| tree | 26ae3e192aa88f123c65a2190810385c581643a7 /docker/base | |
| parent | d25ddf87f3f74c9889e303a9e139296fe70f04dc (diff) | |
| parent | 5cd30d491435b73a1cb7a2b8981de2c1f85761c7 (diff) | |
| download | kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.tar.gz kolla-d69ab19701a142fb654cdecb3d4fda09e098d7a8.zip | |
Merge "Remove Fedora support"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f762276fe..ce2bbbd52 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -24,7 +24,7 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho # 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 ['fedora', 'centos', 'oraclelinux', 'rhel'] %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} RUN if [ $(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release) != "{{ supported_distro_release }}" ]; then \ echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \ @@ -143,23 +143,10 @@ RUN yum -y install \ {% endif %} {# Endif for base_distro oraclelinux #} - {% if base_distro == 'fedora' %} - -# Set up repositories -RUN yum -y install \ - https://rdo.fedorapeople.org/rdo-release.rpm \ - dnf \ - dnf-plugins-core \ - yum-plugin-priorities \ - && yum clean all - - {% endif %} - {# Endif for base_distro fedora #} - #### END REPO ENABLEMENT {# We are back to the basic if conditional here which is: - if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] #} + if base_distro in ['centos', 'oraclelinux', 'rhel'] #} {% block base_redhat_binary_versionlock %}{% endblock %} {% if install_type == 'binary' %} {% set base_centos_binary_packages = [ @@ -193,7 +180,7 @@ RUN yum -y install \ {% endif %} {# endif for install type is source for RPM based distros #} -{# endif for base_distro centos,fedora,oraclelinux,rhel #} +{# endif for base_distro centos,oraclelinux,rhel #} {% elif base_distro in ['ubuntu', 'debian'] %} RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \ |