diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-27 07:35:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-27 07:35:58 +0000 |
| commit | f9b229841db5d27fe11b95d055d74af289893ef2 (patch) | |
| tree | d2f064a3c26186ab3f8ed59b6c351401d9d48dc7 /docker | |
| parent | 867c5d4bc4a9cadc87ed00bb4f15d359b4d038cc (diff) | |
| parent | 555765a7afd21fabd1b760af946b0e9350cc2eae (diff) | |
| download | kolla-f9b229841db5d27fe11b95d055d74af289893ef2.tar.gz kolla-f9b229841db5d27fe11b95d055d74af289893ef2.zip | |
Merge "ppc64le: Ensure that rabbitmq-server.repo exists before trying sed"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 082488602..67c3f0e47 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -112,8 +112,12 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }} # NOTE(hrw): 'rabbitmq-server' is 'noarch' so we can install it on ppc64le from # repo for other architecture. +# NOTE(mjturek): tripleo-ci overrides these repos so the file would not exist +# in that case. We test for the file's existence to avoid sed failing in that case. {% if base_arch == 'ppc64le' %} -RUN sed -i -e 's/\$basearch/x86_64/g' /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo +RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \ + sed -i -e 's/\$basearch/x86_64/g' /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo; \ + fi {% endif %} {% block base_centos_repo_overrides_post_copy %}{% endblock %} |