Merge "Pin CentOS 7.1.1503"
This commit is contained in:
commit
febddb48ee
@ -61,7 +61,8 @@ MASTER_GW?=10.20.0.1
|
||||
|
||||
CENTOS_MAJOR?=7
|
||||
CENTOS_MINOR?=1
|
||||
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR)
|
||||
CENTOS_BUILD?=1503
|
||||
CENTOS_RELEASE:=$(CENTOS_MAJOR).$(CENTOS_MINOR).$(CENTOS_BUILD)
|
||||
CENTOS_ARCH:=x86_64
|
||||
CENTOS_IMAGE_RELEASE:=$(CENTOS_MAJOR)$(CENTOS_MINOR)
|
||||
UBUNTU_RELEASE:=trusty
|
||||
@ -156,7 +157,7 @@ USE_MIRROR?=ext
|
||||
|
||||
ifeq ($(USE_MIRROR),ext)
|
||||
MIRROR_FUEL?=http://mirror.fuel-infra.org/mos-repos/centos/$(PRODUCT_NAME)$(PRODUCT_VERSION)-centos$(CENTOS_MAJOR)-fuel/os/x86_64/
|
||||
MIRROR_CENTOS?=http://mirror.centos.org/centos/$(CENTOS_MAJOR)
|
||||
MIRROR_CENTOS?=http://mirror.centos.org/centos/$(CENTOS_RELEASE)
|
||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
||||
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
|
||||
MIRROR_UBUNTU?=mirror.fuel-infra.org
|
||||
@ -205,7 +206,7 @@ endif
|
||||
# Example: YUM_REPOS?=official epel => yum_repo_official and yum_repo_epel
|
||||
# will be used.
|
||||
YUM_REPOS?=official extras fuel
|
||||
MIRROR_CENTOS?=http://mirror.centos.org/centos/$(CENTOS_MAJOR)
|
||||
MIRROR_CENTOS?=http://mirror.centos.org/centos/$(CENTOS_RELEASE)
|
||||
MIRROR_CENTOS_KERNEL?=$(MIRROR_CENTOS)
|
||||
SANDBOX_MIRROR_CENTOS_UPSTREAM?=$(MIRROR_CENTOS)
|
||||
SANDBOX_MIRROR_EPEL?=http://mirror.yandex.ru/epel
|
||||
|
@ -6,6 +6,12 @@ MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
|
||||
ENV container docker
|
||||
ENV EXTRA_RPM_REPOS _EXTRA_RPM_REPOS_
|
||||
|
||||
RUN echo _CENTOS_RELEASE_ > /etc/yum/vars/releasever
|
||||
# TODO(dteselkin): 'yum swap' was added to fix systemd-container* update issue.
|
||||
# systemd-container* packages were deprecated and cannot be
|
||||
# upgraded. They should be removed in a new docker image built
|
||||
# from scratch. After that this line can be safely removed.
|
||||
RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs
|
||||
RUN yum -y update
|
||||
RUN yum clean all
|
||||
RUN yum -y install dbus
|
||||
|
@ -80,6 +80,7 @@ $(BUILD_DIR)/docker/fuel-centos.done: \
|
||||
rm -rf $(BUILD_DIR)/docker/fuel-centos-build
|
||||
cp -a $(SOURCE_DIR)/docker/fuel-centos-build $(BUILD_DIR)/docker/fuel-centos-build
|
||||
test -n "$(EXTRA_RPM_REPOS)" || sed -e "/_EXTRA_RPM_REPOS_/d" -i $(BUILD_DIR)/docker/fuel-centos-build/Dockerfile
|
||||
sed -e "s|_CENTOS_RELEASE_|$(CENTOS_RELEASE)|" -i $(BUILD_DIR)/docker/fuel-centos-build/Dockerfile
|
||||
sed -e "s|_EXTRA_RPM_REPOS_|$(EXTRA_RPM_REPOS)|" -i $(BUILD_DIR)/docker/fuel-centos-build/Dockerfile
|
||||
sudo docker build -t fuel/fuel-centos-build $(BUILD_DIR)/docker/fuel-centos-build
|
||||
mkdir -p $(BUILD_DIR)/docker/fuel-centos/
|
||||
|
Loading…
Reference in New Issue
Block a user