From a922b332bc891c2f412abb7110b6484e9975b0d5 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Fri, 10 Aug 2018 11:36:45 +0200
Subject: base: do not set $contentdir for CentOS

We no longer have to set $contentdir for CentOS as it is set in centos:7
images now.

This code was required when Docker hub had 7.4 images while 7.5 packages
were already in repositories.

Change-Id: I69d1b87ffb3af1dea2f8cf93a2264df93356e9ed
---
 docker/base/Dockerfile.j2 | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'docker')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index cb389afe3..0aa81b167 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -45,17 +45,6 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
 COPY yum.conf /etc/yum.conf
 {% endblock %}
 
-{% if base_distro in ['centos'] %}
-{% set centos_contentdir = 'centos' %}
-
-{% if base_arch in ['aarch64', 'ppc64le'] %}
-    {% set centos_contentdir = 'altarch' %}
-{% endif %}
-
-RUN echo {{ centos_contentdir }} >> /etc/yum/vars/contentdir
-{% endif %}
-
-
 #### BEGIN REPO ENABLEMENT
 {% set base_yum_repo_files = [
  ] %}
-- 
cgit v1.2.3