diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-11-29 15:07:08 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-11-29 15:09:39 +0800 |
| commit | 0099de48419f62bf71e640ae0cb293fbd25482c4 (patch) | |
| tree | 5991cb9fbda4d4eafa3abcbbc6bc044996c39688 /tools | |
| parent | 06ff52553ea017c132c7865e1b0644480ec091d7 (diff) | |
| download | kolla-0099de48419f62bf71e640ae0cb293fbd25482c4.tar.gz kolla-0099de48419f62bf71e640ae0cb293fbd25482c4.zip | |
Use Dockerfile customization instead of include_header
include_header is marked deprecated and will be removed in the future
Change-Id: I170f7657bebe99f31b04c2c80f5a1c0dbd58000f
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 |