diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-30 16:07:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-30 16:07:19 +0000 |
| commit | 5a9097a0dc9f0151068c5575748748328e7d9a34 (patch) | |
| tree | 3036032d51b165d2f727f681fd9d7aeb61457880 /tools | |
| parent | db1d0226d3ff3493b97e8b3cbc305366d09aaeb6 (diff) | |
| parent | 0099de48419f62bf71e640ae0cb293fbd25482c4 (diff) | |
| download | kolla-5a9097a0dc9f0151068c5575748748328e7d9a34.tar.gz kolla-5a9097a0dc9f0151068c5575748748328e7d9a34.zip | |
Merge "Use Dockerfile customization instead of include_header"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/setup_gate.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index 5d99c74f9..a22044f0b 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -34,10 +34,13 @@ timeout = 60 index-url = $NODEPOOL_PYPI_MIRROR trusted-host = $NODEPOOL_MIRROR_HOST EOF - echo "RUN echo $(base64 -w0 ${PIP_CONF}) | base64 -d > /etc/pip.conf" | sudo tee /etc/kolla/header - rm ${PIP_CONF} - sed -i 's|^#include_header.*|include_header = /etc/kolla/header|' /etc/kolla/kolla-build.conf + cat > /etc/kolla/template-override.j2 <<EOF +{% block header %} +RUN echo $(base64 -w0 ${PIP_CONF}) | base64 -d > /etc/pip.conf +{% endblock %} +EOF + rm ${PIP_CONF} # NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying sed -i 's|^#namespace.*|namespace = lokolla|' /etc/kolla/kolla-build.conf |