Merge pull request #4175 from codificat/20170512-img-build-updates

Merged by openshift-bot

hack/build-images.sh

@@ -10,7 +10,7 @@ source_root=$(dirname "${0}")/..
 prefix="openshift/openshift-ansible"
 version="latest"
 verbose=false
-options=""
+options="-f images/installer/Dockerfile"
 help=false
 
 for args in "$@"

images/installer/Dockerfile

@@ -46,6 +46,6 @@ ADD . /tmp/src
 RUN /usr/libexec/s2i/assemble
 
 # Add files for running as a system container
-COPY system-container/root /
+COPY images/installer/system-container/root /
 
 CMD [ "/usr/libexec/s2i/run" ]

requirements.txt

@@ -1,7 +1,7 @@
 # Versions are pinned to prevent pypi releases arbitrarily breaking
 # tests with new APIs/semantics. We want to update versions deliberately.
 ansible==2.2.2.0
-boto==2.45.0
+boto==2.34.0
 click==6.7
 pyOpenSSL==16.2.0
 # We need to disable ruamel.yaml for now because of test failures