aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-27 13:39:05 +0000
committerGerrit Code Review <review@openstack.org>2020-08-27 13:39:05 +0000
commitb4dde581c528c2072e408768601b75a97551e5a8 (patch)
tree0f5486807e11eac3ba16c68747d46ede4f9967e8
parent0e756bfd6546590656bece95fc0cb3026798b840 (diff)
parent22f63ab54079550cfe0c0ea36eca9823ddf595ea (diff)
downloadkolla-b4dde581c528c2072e408768601b75a97551e5a8.tar.gz
kolla-b4dde581c528c2072e408768601b75a97551e5a8.zip
Merge "bifrost: stop sourcing env-vars"
-rw-r--r--docker/bifrost/bifrost-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index 72521cbe2..10e895441 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -49,7 +49,7 @@ RUN apt-get update && \
{%- else %}
RUN echo " " && \
{%- endif %}
- bash -c './scripts/env-setup.sh && source ./env-vars && \
+ bash -c './scripts/env-setup.sh && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \
{%- if base_package_type == 'deb' %}