Update variable name

PYPI_PACKAGES isn't accurate since we are building from a set of wheels
and we never actually reach out to a pypi mirror. PIP_PACKAGES is more
accurate for the situtation.

I also stopped passing variables to the script but rather call the
variable directly in the script.

Change-Id: I7e2b35ac06f590c2013b030bd8166f87d639424c

Dockerfile

@@ -8,9 +8,9 @@ ARG PROJECT_REPO=https://git.openstack.org/openstack/${PROJECT}
 ARG PROJECT_REF=master
 ARG DISTRO
 ARG PROFILES
-ARG PYPI_PACKAGES
+ARG PIP_PACKAGES
 
 COPY scripts /opt/loci/scripts
 COPY bindep.txt /opt/loci/
 
-RUN /opt/loci/scripts/install.sh ${PYPI_PACKAGES}
+RUN /opt/loci/scripts/install.sh

README.md

@@ -69,7 +69,7 @@ For more advanced building you can use docker build arguments to define:
     base image.
   * `PROFILES` The bindep profiles to specify to configure which packages get
     installed. This is a space sperated list.
-  * `PYPI_PACKAGES` Specify additional packages you would like installed. The
+  * `PIP_PACKAGES` Specify additional packages you would like installed. The
     only caveat is these packages must exist in your WHEELS tarball. So if you
     wanted to include rpdb, you would need to have built that into your WHEELS.
 

scripts/install.sh

@@ -1,6 +1,6 @@
-#!/bin/bash -ex
+#!/bin/bash
 
-packages=$@
+set -ex
 
 distro=$(awk -F= '/^ID=/ {gsub(/\"/, "", $2); print $2}' /etc/*release)
 export distro=${DISTRO:=$distro}
@@ -57,8 +57,7 @@ $(dirname $0)/pip_install.sh \
         pymysql \
         python-memcached \
         uwsgi \
-        bindep \
-        ${packages[@]}
+        bindep
 
 PACKAGES=($(bindep -f /opt/loci/bindep.txt -b ${PROJECT} ${PROFILES} || :))
 

scripts/pip_install.sh

@@ -1,4 +1,6 @@
-#!/bin/bash -ex
+#!/bin/bash
+
+set -ex
 
 packages=$@
 
@@ -10,4 +12,4 @@ mkdir -p /tmp/wheels/
 # stores.
 tar xf /tmp/wheels.tar.gz --exclude='.*' -C /tmp/wheels/
 
-pip install --no-cache-dir --no-index --no-compile --find-links /tmp/wheels/ ${packages[@]}
+pip install --no-cache-dir --no-index --no-compile --find-links /tmp/wheels/ ${packages} ${PIP_PACKAGES}