starlingx
/
root
Code Issues Proposed changes

Merge remote-tracking branch 'gerrit/master' into f/centos76 

Change-Id: I2e9b9348043cf03bd7b49c222b9d26965cd22724
Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Saul Wold 2019-03-04 17:40:25 -08:00
parent 8d756e3b59 dc2d33642a
commit 76ae6ed805
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build-tools/build-docker-images/stx-centos/Dockerfile.master
View File

@ -5,6 +5,7 @@ ARG RELEASE=7.5.1804
FROM centos:${RELEASE}
RUN set -ex ;\
sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\
yum install -y centos-release-openstack-rocky ;\
rm -rf \
/var/log/* \

1
build-tools/build-docker-images/stx-centos/Dockerfile.pike
View File

@ -11,6 +11,7 @@ ARG REPO_OPTS
COPY stx.repo /
RUN set -ex ;\
sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\
mv /stx.repo /etc/yum.repos.d/ ;\
yum upgrade --disablerepo=* ${REPO_OPTS} -y ;\
yum install --disablerepo=* ${REPO_OPTS} -y \

4
build-tools/build-wheels/docker/centos-dockerfile
View File

@ -6,7 +6,9 @@ ARG OPENSTACK_RELEASE=pike
# Install the necessary packages for building the python modules.
# Some of these are dependencies of the specific modules, and could
# instead be added to the wheels.cfg file in the future.
RUN yum install -y epel-release centos-release-openstack-queens ;\
RUN set -ex ;\
sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\
yum install -y epel-release centos-release-openstack-queens ;\
yum install -y git gcc zip bzip2 unzip \
python python-devel python-pip python-wheel \
wget openldap-devel mariadb mariadb-devel \