openstack
/
loci
Code Issues Proposed changes

Quick fix for broken builds 

Change-Id: I642306a0d75c41187405b7cead86f4f8ee73ea82
This commit is contained in:
Sam Yaple 2017-09-21 18:27:50 -04:00
parent 76cb708cd9
commit f7e7f75d7c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dockerfiles/dpkg/Dockerfile
View File

@ -1,6 +1,7 @@
ARG FROM=ubuntu:xenial
FROM ${FROM}
ENV GENERIC=yes
ENV PATH=/var/lib/openstack/bin:$PATH
ARG PROJECT
ARG WHEELS=openstackloci/requirements:ubuntu

1
dockerfiles/rpm/Dockerfile
View File

@ -1,6 +1,7 @@
ARG FROM=centos:7
FROM ${FROM}
ENV GENERIC=yes
ENV PATH=/var/lib/openstack/bin:$PATH
ARG PROJECT
ARG WHEELS=openstackloci/requirements:centos

12
scripts/install.sh
View File

@ -2,6 +2,7 @@
packages=$@
generic=${GENERIC:=no}
distro=${DISTRO:=$(awk -F= '/^ID=/ {print $2}' /etc/*release | tr -d \")}
case ${distro} in
@ -47,7 +48,12 @@ $(dirname $0)/pip_install.sh \
bindep \
${packages[@]}
PACKAGES=$((bindep -f $(dirname $0)/../dockerfiles/bindep.txt -b ${PROJECT} ${PROFILES}))
if [[ ${generic} == 'yes' ]]; then
$(dirname $0)/pip_install.sh bindep
PACKAGES=($(bindep -f $(dirname $0)/../dockerfiles/bindep.txt -b ${PROJECT} ${PROFILES} || :))
else
PACKAGES=()
fi
groupadd -g 42424 ${PROJECT}
useradd -u 42424 -g ${PROJECT} -M -d /var/lib/${PROJECT} -s /usr/sbin/nologin -c "${PROJECT} user" ${PROJECT}
@ -57,14 +63,14 @@ chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJE
case ${distro} in
debian|ubuntu)
apt-get install -y --no-install-recommends ${PACKAGES[@]}
apt-get install -y --no-install-recommends sudo ${PACKAGES[@]}
apt-get purge -y --auto-remove \
git \
virtualenv
rm -rf /var/lib/apt/lists/*
;;
centos)
yum -y install ${PACKAGES[@]}
yum -y install sudo ${PACKAGES[@]}
yum -y autoremove \
git \
python-virtualenv