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:
commit
76ae6ed805
|
@ -5,6 +5,7 @@ ARG RELEASE=7.5.1804
|
||||||
FROM centos:${RELEASE}
|
FROM centos:${RELEASE}
|
||||||
|
|
||||||
RUN set -ex ;\
|
RUN set -ex ;\
|
||||||
|
sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\
|
||||||
yum install -y centos-release-openstack-rocky ;\
|
yum install -y centos-release-openstack-rocky ;\
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/var/log/* \
|
/var/log/* \
|
||||||
|
|
|
@ -11,6 +11,7 @@ ARG REPO_OPTS
|
||||||
COPY stx.repo /
|
COPY stx.repo /
|
||||||
|
|
||||||
RUN set -ex ;\
|
RUN set -ex ;\
|
||||||
|
sed -i '/\[main\]/ atimeout=120' /etc/yum.conf ;\
|
||||||
mv /stx.repo /etc/yum.repos.d/ ;\
|
mv /stx.repo /etc/yum.repos.d/ ;\
|
||||||
yum upgrade --disablerepo=* ${REPO_OPTS} -y ;\
|
yum upgrade --disablerepo=* ${REPO_OPTS} -y ;\
|
||||||
yum install --disablerepo=* ${REPO_OPTS} -y \
|
yum install --disablerepo=* ${REPO_OPTS} -y \
|
||||||
|
|
|
@ -6,7 +6,9 @@ ARG OPENSTACK_RELEASE=pike
|
||||||
# Install the necessary packages for building the python modules.
|
# Install the necessary packages for building the python modules.
|
||||||
# Some of these are dependencies of the specific modules, and could
|
# Some of these are dependencies of the specific modules, and could
|
||||||
# instead be added to the wheels.cfg file in the future.
|
# 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 \
|
yum install -y git gcc zip bzip2 unzip \
|
||||||
python python-devel python-pip python-wheel \
|
python python-devel python-pip python-wheel \
|
||||||
wget openldap-devel mariadb mariadb-devel \
|
wget openldap-devel mariadb mariadb-devel \
|
||||||
|
|
Loading…
Reference in New Issue